Commit Graph

324 Commits

Author SHA1 Message Date
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
2f7dc9ec19 Used lambda function in user detail 2016-09-08 04:15:34 +02:00
41d5a02d77 Fixed account order and detail account view 2016-09-08 03:38:28 +02:00
8d060af46c Removed wierd hack 2016-09-08 03:21:39 +02:00
Skia
4c2bf9cbf9 Launderette and product list fixes 2016-09-08 02:09:17 +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
a64b10776e Monthly user account 2016-09-06 22:13:48 +02:00
78bf4b7b84 Fixed markdown api issue 2016-09-06 21:59:13 +02:00
Skia
d23e07363d Fix settings 2016-09-04 19:26:50 +02:00
Skia
b1f6754e6e Refactor lots of tabed templates, and create TabedViewMixin 2016-09-04 19:25:03 +02:00
Skia
976ae09e55 Fix subscriptions with Sith account 2016-09-04 18:35:20 +02:00
Skia
4503fae287 Merge branch 'sli' into 'master'
Fixed get_age



See merge request !3
2016-09-04 16:54:30 +02:00
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
b0215e7445 Organized settings 2016-09-04 14:56:47 +02:00
5ca8a22123 Fixed Settings 2016-09-04 14:19:56 +02:00
Skia
25dea832be Display bar list with "openness" 2016-09-04 14:17:49 +02:00
8328e668bd Fixed old database bug in dev env 2016-09-02 21:24:10 +02:00
Skia
c62d3f4f4a Add old membership views 2016-09-02 21:21:57 +02:00
Skia
c5fd9d0076 Small template fixes 2016-09-02 19:31:47 +02:00
Skia
a0b1fa32e7 Fix subscription form 2016-09-02 12:29:50 +02:00
Skia
bae34c4b1c Fix double user creation 2016-09-02 09:47:33 +02:00
Skia
29f565f514 Improve club templates 2016-09-02 09:23:21 +02:00
Skia
b2df8fbf18 Fix LoginForm 2016-09-01 17:50:13 +02:00
Skia
3239a2e481 Fix counter if no date of birth 2016-09-01 16:55:43 +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
a4c5d48159 Some bug fixes 2016-09-01 10:00:31 +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
Skia
cb90ab8e57 Fix link to old site 2016-08-30 17:41:42 +02:00
Skia
b21d9f6ff2 Add price for subscriptions 2016-08-30 17:33:45 +02:00
Skia
9cfdf4798d Fix OperationEditView 2016-08-29 20:13:53 +02:00
Skia
e8713b3c22 Merge remote-tracking branch 'origin/api' 2016-08-29 19:50:38 +02:00
Skia
fe2438ef0c Fix subscription right and typo 2016-08-29 19:48:29 +02:00
Skia
3305a19f44 Fix permissions on sellings and refillings 2016-08-29 16:07:14 +02:00
Skia
3667a12174 Fix webcam upload 2016-08-29 04:58:25 +02:00
Skia
c4b1494eee Update settings 2016-08-29 03:34:43 +02:00