Commit Graph

302 Commits

Author SHA1 Message Date
3be64d6a8f New subscription type for jewels
New condition to consider floats in subscriptions
2017-08-31 16:37:03 +02:00
94582a2d96 Free subscription for jewels 2017-08-31 16:18:28 +02:00
Skia
02b317eee8 locale: fix translations
Signed-off-by: Skia <skia@libskia.so>
2017-08-31 15:37:05 +02:00
4f6109e27c Refactor mailings email 2017-08-22 22:39:12 +02:00
62b59f92fd Translations 2017-08-22 15:51:09 +02:00
e785ad985f Add a new subscription for the Welcome Week 2017-08-21 21:06:05 +02:00
f49f889d5b Translations fix 2017-08-15 18:57:50 +02:00
0f408d9d89 Translations 2017-08-15 18:08:32 +02:00
748e3ae326 Refactor and migration corrections 2017-08-15 13:57:49 +02:00
d60e14a303 Migration from old database 2017-08-15 13:57:49 +02:00
40927fa13d Add limit for ecocup recording 2017-08-15 13:57:49 +02:00
Skia
3eea8ed4e3 trombi: make the export page
Signed-off-by: Skia <skia@libskia.so>
2017-08-01 13:54:35 +02:00
Skia
f85ce96225 trombi: Many UI/UX improvements
Signed-off-by: Skia <skia@libskia.so>
2017-06-13 00:23:56 +02:00
Skia
f26f2f4229 trombi: add custom club memberships
Signed-off-by: Skia <skia@libskia.so>
2017-06-12 23:52:59 +02:00
Skia
ecf5465716 Merge branch 'Tresorerie' 2017-06-12 08:13:05 +02:00
Skia
ce46a9d9da Some small clean up and refactoring
Signed-off-by: Skia <skia@libskia.so>
2017-06-10 19:56:47 +02:00
Skia
4b9fa0cd57 Fix some Markdown and add basic textarea helper
Signed-off-by: Skia <skia@libskia.so>
2017-06-10 19:14:58 +02:00
Skia
457fc36e16 Fix markdown rendering on some pages, and add a link to the syntax help
Signed-off-by: Skia <skia@libskia.so>
2017-06-10 16:54:19 +02:00
8ba21b94dc add translations 2017-06-09 16:39:38 +02:00
c4389bb9cd Add a way for admin to delete elections and add archive system 2017-06-07 18:42:16 +02:00
88762c492f Subscriptions stats optimisations + form for start and end date 2017-06-06 23:27:57 +02:00
e97135bf47 Add subscriptions stats 2017-06-06 22:03:56 +02:00
Skia
11d20f43e5 Add some missing translations
Signed-off-by: Skia <skia@libskia.so>
2017-05-31 23:43:22 +02:00
Skia
136d0f3fa0 Add basic BBcode translator
Signed-off-by: Skia <skia@libskia.so>
2017-05-30 23:40:01 +02:00
Skia
862a4619b3 Add doku_to_markdown function 2017-05-14 03:17:42 +02:00
Skia
0a84ef8438 Allow to unmoderate news 2017-05-13 18:32:13 +02:00
Skia
231cb236dc Add moderation tool to Trombi 2017-05-12 18:42:52 +02:00
Skia
a0bd5ee8ff Some more trombi pimping 2017-05-11 18:34:05 +02:00
Skia
d913b8b64f Some more pimp in Trombi + translations 2017-05-10 23:30:20 +02:00
Skia
5060114305 Add missing forum migration (and tiny translation fix) 2017-05-10 19:18:33 +02:00
95d5907a3e Add translation 2017-05-10 10:37:49 +02:00
Skia
8b1a19e2ff Delete django.mo file that reappeared with the stock app 2017-05-01 15:10:18 +02:00
Skia
423313f008 Update stock translations 2017-04-25 09:41:05 +02:00
Skia
20deda8a8e Merge branch 'master' into stock 2017-04-24 18:07:25 +02:00
Skia
830e94d73c Show that a message exists even if we can't see it 2017-04-10 23:27:34 +02:00
53a2a160be Add CB refills sum 2017-04-05 13:48:43 +02:00
9f2566a244 Fix continuous integration 2017-03-30 22:18:03 +02:00
Skia
50413abf76 Fix a weekmail deleteview, and make some translate fix 2017-03-27 15:16:01 +02:00
Skia
b28ce200e6 Fix some translations 2017-03-27 14:31:58 +02:00
Skia
a56d3a3088 Add a help_text to Weekmail edit form 2017-03-12 18:13:04 +01:00
Skia
73cbfd3e82 Add Forum ordering number 2017-03-12 18:06:01 +01:00
Skia
777fdd7bd5 Again, lot of forum improvements 2017-02-24 17:22:13 +01:00
Skia
10d96de385 Translations 2017-02-24 04:37:14 +01:00
Skia
801f6ec786 Translations and small fix in the forum 2017-02-24 03:28:44 +01:00
Skia
147809bb5d Some great weekmail improvements 2017-01-15 22:58:38 +01:00
guillaume-renaud
7d10c5d837 Forms initial quantity addition 2017-01-13 12:38:04 +01:00
Skia
881afd9e0a Improve SAS main view, and make some translations 2017-01-10 23:32:17 +01:00
guillaume-renaud
6f88d0cf8c Translations update 2017-01-08 11:46:25 +01:00
86e3c09bae Add benefit on sellings view 2017-01-05 15:48:06 +01:00
guillaume-renaud
8f88f7cb70 Take item from stock form addition 2017-01-05 11:16:25 +01:00
guillaume-renaud
2f721592f1 Update stock items quantity after shopping 2017-01-05 11:15:45 +01:00
guillaume-renaud
0660ea5e64 MAJ translations ; stock acces addition in user tool 2017-01-05 11:15:04 +01:00
guillaume-renaud
9d8264bcbb remove stock_main.jinja 2017-01-05 11:04:58 +01:00
guillaume-renaud
6c54b246ca Stock admin gestion, items list views, create and edit items 2017-01-05 11:04:12 +01:00
guillaume-renaud
887893fb2d Creation of the Stock list, edit, create views and creation StockItem create view 2017-01-05 11:00:08 +01:00
guillaume-renaud
ccb339b9bd Fix translation files 2017-01-05 11:00:08 +01:00
Skia
fbb41c3cd5 Improve UX for accounting linked operation 2016-12-29 01:08:08 +01:00
3609952db5 Some translation fixs 2016-12-26 00:37:32 +01:00
cd97901db1 Some date fix 2016-12-25 23:37:42 +01:00
4d067165aa Election's trad 2016-12-25 20:09:18 +01:00
Skia
b79c77f268 Add notification with a fresh new 2016-12-23 20:11:27 +01:00
Skia
be44a3ab0b Add preview button to news 2016-12-23 19:43:59 +01:00
Skia
1dc1a0a42c Add news moderation tool 2016-12-23 18:40:37 +01:00
Skia
c95e7565e7 Make news translations 2016-12-23 03:17:38 +01:00
Skia
33ee449fb5 Make translations 2016-12-21 05:23:01 +01:00
Skia
bdcc0bf6e9 Remake the statement by nature 2016-12-21 05:19:16 +01:00
Skia
168622a04d Add com app with first parametric texts 2016-12-21 02:38:21 +01:00
c372b22197 Management for companies added 2016-12-20 12:29:13 +01:00
Skia
642249e7fb Notification fix 2016-12-14 09:11:26 +01:00
Skia
e3c86c1d05 Add "Mark all as read" 2016-12-13 17:53:44 +01:00
Skia
0859648bd4 Add cut/paste function in files 2016-12-13 00:45:38 +01:00
Skia
d92a706920 Refactor notifications 2016-12-10 00:06:17 +01:00
Skia
66d73d69ec Improve SAS moderation page 2016-12-09 18:42:02 +01:00
Skia
a02d5a65cb Improve a bit SAS moderation 2016-12-09 15:46:47 +01:00
Skia
80fa99d2ac Add notification 2016-12-08 19:47:28 +01:00
3c8a4f068e Refound Account 2016-11-30 08:19:52 +01:00
0b4f826594 Add PDF operations generation 2016-11-29 12:35:37 +01:00
Skia
c1861755bc Translation update 2016-11-29 11:26:18 +01:00
juste
ff9ed9002e a simple footer + traductions 2016-11-28 11:26:06 +01:00
Skia
da35292cd5 Add is_in_sas field, to perform queries on it 2016-11-23 11:46:45 +01:00
Skia
0e0e57458f Improve SAS UX 2016-11-23 11:46:45 +01:00
Skia
f900db0dd2 Make SAS translations 2016-11-23 11:46:45 +01:00
Skia
815ef03860 Better handle rotations 2016-11-23 11:46:45 +01:00
Skia
e681cc65fe Add SAS moderation tool 2016-11-23 11:46:45 +01:00
Skia
321dead0de Translation updates, and make the binary compiled translation file ignored 2016-11-08 18:56:57 +01:00
guillaume-renaud
57b663c4c5 counter inactive state with settings variable, traduction file problem fixed 2016-11-08 18:48:27 +01:00
2dd2189314 Download sellings as csv 2016-11-08 14:57:09 +01:00
b6966c9502 Add number of places on ebticket 2016-11-04 00:43:28 +01:00
Skia
ea85d26cdd Almost revert "Add link to create club in rootplace"
Keep the links, but revert and fix the translation file

This reverts commit 029bc7cc7c.
2016-11-03 11:52:04 +01:00
677c50a4b1 Add unknown event translation 2016-10-25 21:53:40 +02:00
b00fc23fc4 Add automatic mail when an eticket has been bought 2016-10-21 17:47:56 +02:00
029bc7cc7c Add link to create club in rootplace 2016-10-18 23:36:26 +02:00
2daaf992f2 Add groups, allow to ban users from counters and from buying alcohol 2016-10-16 03:45:06 +02:00
ba86219b74 Translations for alcool ban 2016-10-15 19:58:32 +02:00
guillaume-renaud
5b50cc9598 Traduction's addition for user_clubs templates 2016-10-07 13:17:43 +02:00
Skia
7fdcb0c815 Finish labels in accounting 2016-10-05 15:54:11 +02:00
Skia
d6138a7a0c Make the etickets 2016-10-03 19:30:05 +02:00
Skia
ca3b7fda5a Improve invoice call template 2016-09-29 18:34:58 +02:00
Skia
51f342a7d3 Add invoices calls 2016-09-29 18:19:58 +02:00
Skia
ddceb82abf Display uncategorized products 2016-09-29 16:19:05 +02:00
Skia
2e7e78b8ce Add last ops view to the bars 2016-09-28 11:09:54 +02:00
Skia
303db0bc7d Translation and explicit string 2016-09-26 11:31:45 +02:00
Skia
7a2985b186 Add product top 10 2016-09-26 11:17:55 +02:00
Skia
9e4e9597d1 Add the merge user function 2016-09-21 14:09:26 +02:00
Skia
5b83aff351 Small UI fix 2016-09-19 20:40:38 +02:00
Skia
d88da0abd8 Make translations for godfathers 2016-09-19 20:32:30 +02:00
Skia
95b22cafe0 Template fixes 2016-09-15 11:51:05 +02:00
Skia
6cf253365b Add cash register summary view 2016-09-13 02:04:49 +02:00
Skia
b0ce448ec7 Add missing translation 2016-09-12 17:38:35 +02:00
Skia
7aec32cef0 Some quick improvement on account view 2016-09-09 20:38:27 +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
Skia
e1ce661a04 Improvements in counter admin templates 2016-09-04 15:50:43 +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
3239a2e481 Fix counter if no date of birth 2016-09-01 16:55:43 +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
f66b999f24 Improve login form 2016-08-31 02:44:46 +02:00
Skia
b21d9f6ff2 Add price for subscriptions 2016-08-30 17:33:45 +02:00
Skia
fe2438ef0c Fix subscription right and typo 2016-08-29 19:48:29 +02:00
Skia
f0499cdb26 Make a better index page 2016-08-29 03:25:47 +02:00
Skia
4215baec26 Make the bar menu 2016-08-29 03:14:53 +02:00
Skia
325da79e45 Add support for subscription typed products in eboutic 2016-08-29 03:02:13 +02:00
Skia
01c3991988 Add cash register summaries 2016-08-26 20:57:04 +02:00
Skia
fb8e7ceb5b Some templating and migration fix 2016-08-24 21:49:46 +02:00
Skia
078b63d970 Migrate accounting 2016-08-24 19:50:22 +02:00
Skia
f2c3c7dc25 Add viewable flag for user 2016-08-22 18:44:03 +02:00
Skia
dbf0653baf Add support for product buying groups + many cosmetics and form pimping 2016-08-20 22:12:46 +02:00
Skia
7e90e657a7 Add ajax-select app and improve some templates 2016-08-19 23:24:23 +02:00
Skia
f1105d704e Add basic search bar 2016-08-19 02:53:44 +02:00
Skia
05bd177a9d Migrate invoices and lot of eboutic improvements 2016-08-18 19:52:20 +02:00
Skia
84364d9018 Improve counter app and migrate products/producttypes/refillings/sellings 2016-08-18 03:04:50 +02:00
Skia
66fdf6cbf7 Migrate and improve subscriptions 2016-08-14 19:28:14 +02:00
Skia
792563999b Allow root to reset user password 2016-08-13 17:15:45 +02:00
Skia
43b709bfd5 Make file modale chooser and complete user profile 2016-08-11 04:30:24 +02:00
Skia
792d66da33 Add nice whole file support 2016-08-10 05:48:06 +02:00
Skia
a0f7150c55 Update accounting to have a target 2016-08-07 20:10:50 +02:00
Skia
1529af32c5 Add token handling form in launderette 2016-08-06 15:20:38 +02:00
Skia
7002139176 Finish the launderette click view 2016-08-02 00:32:55 +02:00
Skia
ba48adab6d Improve launderette plannings and admin part 2016-07-29 13:00:32 +02:00
Skia
a01fc63a82 Begin launderette 2016-07-28 20:05:56 +02:00
Skia
80f72df1de Add product type management views 2016-07-27 20:05:45 +02:00
Skia
4408890ab2 Templating and translation 2016-07-27 00:13:20 +02:00
Skia
0ecb78a101 Fix some counter stuff 2016-07-22 13:34:34 +02:00
Skia
256651f580 Translation fix 2016-07-22 02:20:13 +02:00
Skia
a0322fa931 Templating pages 2016-07-22 02:05:29 +02:00
Skia
1f3e186e27 Update counters and some views 2016-07-21 20:03:56 +02:00
Skia
724f3d8d6f Templates and views 2016-07-21 12:09:57 +02:00
Skia
97ff4341a7 Translate most of the Sith 2016-07-19 19:03:16 +02:00
Skia
1b4324f38f Add french translation file 2016-07-18 17:47:43 +02:00