Commit Graph

270 Commits

Author SHA1 Message Date
Skia
71d22e367b Add picture view to users 2016-11-23 11:46:45 +01:00
Skia
22ab21e4e1 Add picture-people relation and ask for removal thing 2016-11-23 11:46:45 +01:00
Skia
b619619b85 Improve moderation tool in SAS 2016-11-23 11:46:45 +01:00
Skia
157b1e4c78 Add file moderation tool 2016-11-23 11:46:45 +01:00
Skia
585ba55e5e Continue SAS 2016-11-23 11:46:40 +01:00
Skia
d554a5ee8d Begin SAS 2016-11-23 11:38:01 +01:00
Skia
0b068d3e92 Improve file moderation 2016-11-23 11:30:57 +01:00
Skia
9e32840549 Add file moderation tool 2016-11-23 00:51:20 +01:00
Skia
cfbd610305 Revert "Merge branch 'fond-gala' into 'master'"
This reverts merge request !25
2016-11-21 14:10:29 +01:00
d418da679b Add background for gala 2016 2016-11-13 22:55:32 +01:00
Skia
e98ffb5cd5 Fix unappropriate behavior when delete selling 2016-11-10 13:51:56 +01:00
guillaume-renaud
63f10c13d4 Add inactive state for counters 2016-11-08 18:42:12 +01:00
Skia
54d3ca8e65 Merge branch 'sli' into 'master'
Edit CONTRIBUTING instructions

See merge request !20
2016-11-06 23:27:00 +01:00
160c7806df Fix contributing.md and fix quantity display on eticket 2016-11-06 23:15:43 +01:00
Skia
20ff409547 Fix tests 2016-11-06 11:36:54 +01:00
Skia
59f5917b8c Fix Page locking 2016-11-05 13:37:39 +01:00
Skia
9cfc029fb2 Permission fix 2016-10-27 18:39:40 +02:00
b00fc23fc4 Add automatic mail when an eticket has been bought 2016-10-21 17:47:56 +02:00
224374f5e8 More readable user_account 2016-10-19 01:57:54 +02:00
029bc7cc7c Add link to create club in rootplace 2016-10-18 23:36:26 +02:00
c40171fe86 Clean permission check for alcohol and counter ban 2016-10-18 23:02:53 +02:00
2daaf992f2 Add groups, allow to ban users from counters and from buying alcohol 2016-10-16 03:45:06 +02:00
1c97c8a74f Swag dropdown on user account + autofocus for refillings on counters 2016-10-16 02:47:21 +02:00
257cb9cfe7 Add ban for alcohol 2016-10-15 02:33:38 +02:00
178a4af196 Add lazy way to make an user property editable once only 2016-10-13 22:58:26 +02:00
579c25d63a Deny date of birth, first and last name modification for non board or root user 2016-10-13 22:32:13 +02:00
Skia
5931351c0a Another tiny template improvement 2016-10-12 12:32:04 +02:00
d285fbe04a Add account number and suscription on counter 2016-10-08 23:07:10 +02:00
guillaume-renaud
5b50cc9598 Traduction's addition for user_clubs templates 2016-10-07 13:17:43 +02:00
guillaume-renaud
760b33728b Addition of the user's club tab as table 2016-10-06 11:08:32 +02:00
guillaume-renaud
1b63d58586 Addition of the user's club tab 2016-10-06 11:08:32 +02:00
Skia
63217b2ead Improve product display 2016-10-05 15:57:04 +02:00
Skia
64b4484620 Some templating 2016-10-04 00:41:08 +02:00
Skia
cd23fdf3ef Add missing eticket banner 2016-10-03 19:43:22 +02:00
Skia
d6138a7a0c Make the etickets 2016-10-03 19:30:05 +02:00
Skia
52184c4012 Merge branch 'sli' into 'master'
Godfathers deletion



See merge request !11
2016-09-29 15:12:19 +02:00
2c6f17063a Can delete Godfathers 2016-09-29 15:06:39 +02:00
a008f34288 Fix bug where slots appears when slot expired 2016-09-28 17:22:34 +02:00
Skia
2e7e78b8ce Add last ops view to the bars 2016-09-28 11:09:54 +02:00
8ef45bf03c Rename is_token to check_token 2016-09-28 10:53:27 +02:00
17b098ca2a Fixed lookup for loged barmen 2016-09-27 22:57:06 +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
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