Commit Graph

372 Commits

Author SHA1 Message Date
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
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
b1f6754e6e Refactor lots of tabed templates, and create TabedViewMixin 2016-09-04 19:25:03 +02:00
e1ce661a04 Improvements in counter admin templates 2016-09-04 15:50:43 +02:00
25dea832be Display bar list with "openness" 2016-09-04 14:17:49 +02:00
c5fd9d0076 Small template fixes 2016-09-02 19:31:47 +02:00
d27f62dca9 Small fixes 2016-09-01 16:43:21 +02:00
1f31d3b56f Send a mail when someone is subscribed 2016-08-31 18:40:17 +02:00
6af16cc893 Some basic templating 2016-08-31 17:18:21 +02:00
37d303634c Fix form with files 2016-08-31 15:29:16 +02:00
0db7180d43 Do some user profile templating 2016-08-31 04:04:28 +02:00
4a29a431af Display user amount without the account page 2016-08-31 03:25:26 +02:00
fe2438ef0c Fix subscription right and typo 2016-08-29 19:48:29 +02:00
3667a12174 Fix webcam upload 2016-08-29 04:58:25 +02:00
f0499cdb26 Make a better index page 2016-08-29 03:25:47 +02:00
4215baec26 Make the bar menu 2016-08-29 03:14:53 +02:00
325da79e45 Add support for subscription typed products in eboutic 2016-08-29 03:02:13 +02:00
e61b5e7690 Small fixes 2016-08-29 01:31:58 +02:00
fb8e7ceb5b Some templating and migration fix 2016-08-24 21:49:46 +02:00
078b63d970 Migrate accounting 2016-08-24 19:50:22 +02:00
a4df1ae9a5 Add language chooser 2016-08-24 19:11:09 +02:00
8e3eb1e2bf Some templating and add webcam support for profile editing 2016-08-22 02:56:27 +02:00
dbf0653baf Add support for product buying groups + many cosmetics and form pimping 2016-08-20 22:12:46 +02:00
62745e89fa User profile template fix 2016-08-20 13:57:27 +02:00
84efcd87e7 Translate datepicker and add age limit to products 2016-08-20 02:55:48 +02:00
7e90e657a7 Add ajax-select app and improve some templates 2016-08-19 23:24:23 +02:00
f1105d704e Add basic search bar 2016-08-19 02:53:44 +02:00
0689f864d2 Migrate permanencies and add user stats view 2016-08-18 21:32:18 +02:00
b69c3a6792 Improve and fix user accounts 2016-08-18 21:06:10 +02:00
05bd177a9d Migrate invoices and lot of eboutic improvements 2016-08-18 19:52:20 +02:00