4749c45c97
Merge branch 'sli' into 'master'
...
Hided launderette slots and tokens for non authorized users and added is_office and is_launderette
See merge request !8
2016-09-26 09:23:35 +02:00
klmp200
380f41445a
Modify property names
2016-09-22 13:07:22 +02:00
klmp200
e250acf82d
Used settings for office and launderette
2016-09-22 13:00:00 +02:00
ffd4dac2e2
Allow club staff to delete their sellings
2016-09-22 12:52:15 +02:00
ae6a613f9a
Add promo_17.png
2016-09-21 15:41:12 +02:00
9e4e9597d1
Add the merge user function
2016-09-21 14:09:26 +02:00
klmp200
748ad1c5c2
Fixed some mistakes
2016-09-21 14:01:44 +02:00
klmp200
2d16b9c296
Hided launderette slots and tokens for non authorized users and added is_office and is_launderette
2016-09-21 13:33:02 +02:00
f1e54439e1
Small stats fix
2016-09-21 12:19:34 +02:00
324bd69312
Small templates fixes
2016-09-20 20:38:12 +02:00
krophil
1d9c058132
Revert "radius removed"
...
This reverts commit 26a1300417
2016-09-20 17:12:09 +02:00
krophil
521c2f2afb
Merge branch 'krophil' of https://ae-dev.utbm.fr/ae/Sith into krophil
2016-09-20 13:23:36 +02:00
krophil
62c4036dee
radius removed
2016-09-20 13:22:05 +02:00
krophil
b11c5bbd1d
Merging
2016-09-20 13:19:44 +02:00
krophil
4ee858c130
README updated
2016-09-20 13:18:05 +02:00
1e0904b48e
Merge branch 'sli' into 'master'
...
Quick fix to hide account number in profile page when not owner user or root
Faut vite cacher les numéros de compte des gens à qui ils n'apartiennent pas, sinon c'est la faille de sécu D:
See merge request !6
2016-09-19 20:43:33 +02:00
5b83aff351
Small UI fix
2016-09-19 20:40:38 +02:00
d88da0abd8
Make translations for godfathers
2016-09-19 20:32:30 +02:00
5ba2ab925d
Add godfathers
2016-09-19 20:29:43 +02:00
krophil
26a1300417
radius removed
2016-09-19 11:20:37 +02:00
klmp200
584025acf0
Quick fix to hide account number in profile page when not owner user or root
2016-09-18 22:50:10 +02:00
95b22cafe0
Template fixes
2016-09-15 11:51:05 +02:00
35d811317c
Add top 100 to counters
2016-09-15 11:07:03 +02:00
6aaeb7cdc9
Rename membership to memberships
2016-09-15 11:06:51 +02:00
3d9dfbc43a
Fix gitignore
2016-09-14 13:46:43 +02:00
f29e5ecabb
Fix static files for dev
2016-09-14 13:46:17 +02:00
64761a83ed
Don't come with MySQL by default
2016-09-14 13:19:56 +02:00
6cf253365b
Add cash register summary view
2016-09-13 02:04:49 +02:00
b0ce448ec7
Add missing translation
2016-09-12 17:38:35 +02:00
09f61eb61c
Only root can create a new launderette
2016-09-12 17:35:25 +02:00
6cacfb8d8d
Add counter activity
2016-09-12 17:34:33 +02:00
c748bb8450
Fix slow selling page in clubs
2016-09-12 17:34:17 +02:00
b63923d956
Refactor settings
2016-09-12 14:04:50 +02:00
54444b31ba
Some template improvements
2016-09-11 19:00:12 +02:00
krophil
07363c607b
Few proposals in CSS
2016-09-11 14:53:55 +02:00
krophil
1b728e3a8b
README updated
2016-09-11 14:53:55 +02:00
7aec32cef0
Some quick improvement on account view
2016-09-09 20:38:27 +02:00
5e26e5bde7
Merge branch 'sli'
2016-09-09 19:56:48 +02:00
5b5006892d
Make sellings for clubs
2016-09-09 16:23:35 +02:00
90e47c9d7d
Add a restriction on the counter login view to authorize only the sellers
2016-09-09 01:54:26 +02:00
klmp200
2f7dc9ec19
Used lambda function in user detail
2016-09-08 04:15:34 +02:00
klmp200
41d5a02d77
Fixed account order and detail account view
2016-09-08 03:38:28 +02:00
klmp200
8d060af46c
Removed wierd hack
2016-09-08 03:21:39 +02:00
4c2bf9cbf9
Launderette and product list fixes
2016-09-08 02:09:17 +02:00
klmp200
bca8dc039a
Added macros for slots and tokens display
2016-09-07 23:06:38 +02:00
klmp200
61c77a7877
Added address on profile
2016-09-07 02:07:01 +02:00
klmp200
c0296b9ada
Added slots on user profile
2016-09-07 01:51:34 +02:00
klmp200
a64b10776e
Monthly user account
2016-09-06 22:13:48 +02:00
klmp200
78bf4b7b84
Fixed markdown api issue
2016-09-06 21:59:13 +02:00
d23e07363d
Fix settings
2016-09-04 19:26:50 +02:00
Skia
klmp200
Skia
krophil