Commit Graph

375 Commits

Author SHA1 Message Date
Skia
fd482195f8 Merge branch 'sli' into 'master'
AutoCompleteSelectField on clubs



See merge request !10
2016-09-28 10:59:13 +02:00
8ef45bf03c Rename is_token to check_token 2016-09-28 10:53:27 +02:00
1c6df0909b Fixes double check on board member in club view 2016-09-28 10:46:06 +02:00
17b098ca2a Fixed lookup for loged barmen 2016-09-27 22:57:06 +02:00
17b483bd21 AutoCompleteSelectField on clubs 2016-09-27 21:05:57 +02:00
Skia
f152791d90 Merge branch 'sli' into 'master'
Only club members can view counter's stats

N'importe qui peut accéder aux tops 100, c'est pas très cool de voir ce que dépensent les autres…

See merge request !9
2016-09-27 20:12:57 +02:00
3c408551aa Remove nested exception for stats and added property on AnonymusUser 2016-09-27 16:56:30 +02:00
f7722ed564 Fixed permissions on stats 2016-09-27 16:44:12 +02:00
f22f2cbde6 Only club members can view counter's stats 2016-09-26 23:56:24 +02:00
Skia
303db0bc7d Translation and explicit string 2016-09-26 11:31:45 +02:00
Skia
a4ad7f0e85 Add token to counter to see pictures and to prevend misuses 2016-09-26 11:17:56 +02:00
Skia
37072e1640 Clean up some useless prints 2016-09-26 11:17:55 +02:00
Skia
7a2985b186 Add product top 10 2016-09-26 11:17:55 +02:00
Skia
24d744ee9c Merge branch 'krophil' into 'master'
Krophil

Few changes in css

See merge request !7
2016-09-26 09:25:13 +02:00
Skia
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
380f41445a Modify property names 2016-09-22 13:07:22 +02:00
e250acf82d Used settings for office and launderette 2016-09-22 13:00:00 +02:00
Skia
ffd4dac2e2 Allow club staff to delete their sellings 2016-09-22 12:52:15 +02:00
Skia
ae6a613f9a Add promo_17.png 2016-09-21 15:41:12 +02:00
Skia
9e4e9597d1 Add the merge user function 2016-09-21 14:09:26 +02:00
748ad1c5c2 Fixed some mistakes 2016-09-21 14:01:44 +02:00
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
Skia
f1e54439e1 Small stats fix 2016-09-21 12:19:34 +02:00
Skia
324bd69312 Small templates fixes 2016-09-20 20:38:12 +02:00
1d9c058132 Revert "radius removed"
This reverts commit 26a1300417.
2016-09-20 17:12:09 +02:00
521c2f2afb Merge branch 'krophil' of https://ae-dev.utbm.fr/ae/Sith into krophil 2016-09-20 13:23:36 +02:00
62c4036dee radius removed 2016-09-20 13:22:05 +02:00
b11c5bbd1d Merging 2016-09-20 13:19:44 +02:00
4ee858c130 README updated 2016-09-20 13:18:05 +02:00
Skia
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
Skia
5b83aff351 Small UI fix 2016-09-19 20:40:38 +02:00
Skia
d88da0abd8 Make translations for godfathers 2016-09-19 20:32:30 +02:00
Skia
5ba2ab925d Add godfathers 2016-09-19 20:29:43 +02:00
26a1300417 radius removed 2016-09-19 11:20:37 +02:00
584025acf0 Quick fix to hide account number in profile page when not owner user or root 2016-09-18 22:50:10 +02:00
Skia
95b22cafe0 Template fixes 2016-09-15 11:51:05 +02:00
Skia
35d811317c Add top 100 to counters 2016-09-15 11:07:03 +02:00
Skia
6aaeb7cdc9 Rename membership to memberships 2016-09-15 11:06:51 +02:00
Skia
3d9dfbc43a Fix gitignore 2016-09-14 13:46:43 +02:00
Skia
f29e5ecabb Fix static files for dev 2016-09-14 13:46:17 +02:00
Skia
64761a83ed Don't come with MySQL by default 2016-09-14 13:19:56 +02:00
Skia
6cf253365b Add cash register summary view 2016-09-13 02:04:49 +02:00
Skia
b0ce448ec7 Add missing translation 2016-09-12 17:38:35 +02:00
Skia
09f61eb61c Only root can create a new launderette 2016-09-12 17:35:25 +02:00
Skia
6cacfb8d8d Add counter activity 2016-09-12 17:34:33 +02:00
Skia
c748bb8450 Fix slow selling page in clubs 2016-09-12 17:34:17 +02:00
Skia
b63923d956 Refactor settings 2016-09-12 14:04:50 +02:00
Skia
54444b31ba Some template improvements 2016-09-11 19:00:12 +02:00
07363c607b Few proposals in CSS 2016-09-11 14:53:55 +02:00
1b728e3a8b README updated 2016-09-11 14:53:55 +02:00