Commit Graph

152 Commits

Author SHA1 Message Date
8771cc9b86 Enhance user picture view 2016-11-30 12:59:03 +01:00
c1861755bc Translation update 2016-11-29 11:26:18 +01:00
ff9ed9002e a simple footer + traductions 2016-11-28 11:26:06 +01:00
cfbb6f4e1f Lot of small improvement in SAS 2016-11-25 13:47:09 +01:00
0e0e57458f Improve SAS UX 2016-11-23 11:46:45 +01:00
815ef03860 Better handle rotations 2016-11-23 11:46:45 +01:00
71d22e367b Add picture view to users 2016-11-23 11:46:45 +01:00
b619619b85 Improve moderation tool in SAS 2016-11-23 11:46:45 +01:00
d554a5ee8d Begin SAS 2016-11-23 11:38:01 +01:00
9e32840549 Add file moderation tool 2016-11-23 00:51:20 +01:00
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
e98ffb5cd5 Fix unappropriate behavior when delete selling 2016-11-10 13:51:56 +01:00
63f10c13d4 Add inactive state for counters 2016-11-08 18:42:12 +01:00
160c7806df Fix contributing.md and fix quantity display on eticket 2016-11-06 23:15:43 +01: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
1c97c8a74f Swag dropdown on user account + autofocus for refillings on counters 2016-10-16 02:47:21 +02:00
d285fbe04a Add account number and suscription on counter 2016-10-08 23:07:10 +02:00
5b50cc9598 Traduction's addition for user_clubs templates 2016-10-07 13:17:43 +02:00
760b33728b Addition of the user's club tab as table 2016-10-06 11:08:32 +02:00
1b63d58586 Addition of the user's club tab 2016-10-06 11:08:32 +02:00
d6138a7a0c Make the etickets 2016-10-03 19:30:05 +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
7a2985b186 Add product top 10 2016-09-26 11:17:55 +02:00
24d744ee9c Merge branch 'krophil' into 'master'
Krophil

Few changes in css

See merge request !7
2016-09-26 09:25:13 +02:00
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
ffd4dac2e2 Allow club staff to delete their sellings 2016-09-22 12:52:15 +02:00
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
324bd69312 Small templates fixes 2016-09-20 20:38:12 +02:00
b11c5bbd1d Merging 2016-09-20 13:19:44 +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
5ba2ab925d Add godfathers 2016-09-19 20:29:43 +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
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
6cf253365b Add cash register summary view 2016-09-13 02:04:49 +02:00
6cacfb8d8d Add counter activity 2016-09-12 17:34:33 +02:00
54444b31ba Some template improvements 2016-09-11 19:00:12 +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
41d5a02d77 Fixed account order and detail account view 2016-09-08 03:38:28 +02:00
bca8dc039a Added macros for slots and tokens display 2016-09-07 23:06:38 +02:00
61c77a7877 Added address on profile 2016-09-07 02:07:01 +02:00
c0296b9ada Added slots on user profile 2016-09-07 01:51:34 +02:00