klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-12-23 08:11:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
353 Commits 20 Branches 0 Tags 112 MiB
4749c45c97
Commit Graph

220 Commits

Author SHA1 Message Date
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
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
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
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
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
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
5ba2ab925d Add godfathers 2016-09-19 20:29:43 +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
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
6cf253365b Add cash register summary view 2016-09-13 02:04:49 +02:00
Skia
6cacfb8d8d Add counter activity 2016-09-12 17:34:33 +02:00
Skia
54444b31ba Some template improvements 2016-09-11 19:00:12 +02:00
Skia
7aec32cef0 Some quick improvement on account view 2016-09-09 20:38:27 +02:00
Skia
5e26e5bde7 Merge branch 'sli' 2016-09-09 19:56:48 +02:00
Skia
5b5006892d Make sellings for clubs 2016-09-09 16:23:35 +02:00
Skia
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
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
Skia
b1f6754e6e Refactor lots of tabed templates, and create TabedViewMixin 2016-09-04 19:25:03 +02:00
klmp200
80549c7a33 Fixed get_age 2016-09-04 16:26:02 +02:00
Skia
e1ce661a04 Improvements in counter admin templates 2016-09-04 15:50:43 +02:00
Skia
d93dda1c0e Merge branch 'sli' into 'master' 
Fixed old database bug in dev env



See merge request !2
 2016-09-04 15:00:16 +02:00
Skia
25dea832be Display bar list with "openness" 2016-09-04 14:17:49 +02:00
klmp200
8328e668bd Fixed old database bug in dev env 2016-09-02 21:24:10 +02:00
Skia
c5fd9d0076 Small template fixes 2016-09-02 19:31:47 +02:00
Skia
b2df8fbf18 Fix LoginForm 2016-09-01 17:50:13 +02:00
Skia
d27f62dca9 Small fixes 2016-09-01 16:43:21 +02:00
Skia
f7e3251ae5 Right fix and translation 2016-09-01 11:27:00 +02:00
Skia
1f31d3b56f Send a mail when someone is subscribed 2016-08-31 18:40:17 +02:00
Skia
6af16cc893 Some basic templating 2016-08-31 17:18:21 +02:00
Skia
37d303634c Fix form with files 2016-08-31 15:29:16 +02:00
Skia
a47cca1b1e Very small CSS improvement 2016-08-31 04:08:28 +02:00
Skia
0db7180d43 Do some user profile templating 2016-08-31 04:04:28 +02:00
Skia
55ea2ac763 Change link color 2016-08-31 03:32:55 +02:00
Skia
4a29a431af Display user amount without the account page 2016-08-31 03:25:26 +02:00
Skia
f66b999f24 Improve login form 2016-08-31 02:44:46 +02:00
Skia
fcfbfb3a0b Small file fix 2016-08-31 02:05:04 +02:00