Commit Graph

460 Commits

Author SHA1 Message Date
Skia
ea52462217 Add Forum 2017-01-21 03:42:06 +01:00
Skia
ae0b7699f3 Finish weekmail, and fix preferences page 2017-01-15 23:02:03 +01:00
Skia
147809bb5d Some great weekmail improvements 2017-01-15 22:58:38 +01:00
Skia
83555a3640 Add preferences and improve weekmail 2017-01-15 22:58:38 +01:00
Skia
176b1bf588 Fix QuickNotifMixin 2017-01-15 22:58:37 +01:00
Skia
0aef7656b8 Add quick notifications prototype 2017-01-15 22:58:37 +01:00
Skia
9d1eaed625 Make some weekmail views 2017-01-15 22:58:37 +01:00
Skia
93e51776c1 Merge branch 'eticketUpdate' into 'master'
partners banner added

See merge request !33
2017-01-13 08:58:15 +01:00
Skia
5a305354cb Add recursive option to file props form 2017-01-12 20:55:47 +01:00
4a5d789d9f partners banner added 2017-01-07 17:39:21 +01:00
Skia
d400995e9d Update setup command to ease development 2017-01-07 10:36:54 +01:00
guillaume-renaud
0660ea5e64 MAJ translations ; stock acces addition in user tool 2017-01-05 11:15:04 +01:00
Skia
114272df2f Add simple club stats 2017-01-04 17:38:54 +01:00
Skia
c48449cd50 Add barman stats 2017-01-04 17:38:09 +01:00
Skia
c6422fdd30 Add SYNTAX.md 2016-12-26 01:42:45 +01:00
Skia
1dd28672b0 Add Markdown test to populate 2016-12-26 01:36:07 +01:00
Skia
f77856852d Working file:// link 2016-12-26 01:34:44 +01:00
Skia
323b946e1f First dfile:// parsing, not working into links, need to investigate 2016-12-26 01:34:44 +01:00
3609952db5 Some translation fixs 2016-12-26 00:37:32 +01:00
e17fd22a37 Fix populate after rebase 2016-12-25 20:24:18 +01:00
4f62863599 Pimp role and list forms and add edit for election 2016-12-25 19:54:10 +01:00
97f835eb4e Convert indent with space, fix populate and add an s 2016-12-25 19:54:10 +01:00
1f60fbd484 Uses election_detail for vote form 2016-12-25 19:54:10 +01:00
Skia
177e39bd6e Fix RuntimeWarning in populate 2016-12-25 19:54:10 +01:00
Jean-Baptiste Lenglet
94d15684b7 Added profile pictures for users 2016-12-25 19:53:04 +01:00
e8ead338d0 Removed useless widget added previously + began voteform 2016-12-25 19:52:14 +01:00
d72d8366cf Add new widget (not tested) and new bdd scheme for elections 2016-12-25 19:52:14 +01:00
7956067686 Election right update 2016-12-25 19:52:14 +01:00
2764f6d2d2 Refactor List Model 2016-12-25 19:52:14 +01:00
c604282b77 Nice display for elections 2016-12-25 19:52:14 +01:00
52e69b0ac1 Refactor elections 2016-12-25 19:52:14 +01:00
a284637190 Normally fixs tests 2016-12-25 19:52:14 +01:00
fd3309fc5f Refactor election bdd 2016-12-25 19:52:14 +01:00
d685e9ba29 Election bdd + first view 2016-12-25 19:52:14 +01:00
f7b4258f20 populate updated 2016-12-24 16:16:14 +01:00
418537bc8e tests for accounting added 2016-12-24 16:16:14 +01:00
Skia
df7b0a5ffe Clean migrations for news system 2016-12-24 02:12:46 +01:00
Skia
1dc1a0a42c Add news moderation tool 2016-12-23 18:40:37 +01:00
93211d8ada operations added in populate 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
Skia
4edd535460 Change DateField to DateTimeField to improve indexing efficency 2016-12-20 16:28:30 +01:00
Skia
bdd29a4d65 Allow quick index updates 2016-12-20 15:19:11 +01:00
Skia
e66b274f0e Add index to search function 2016-12-20 14:46:08 +01:00
Skia
5b95299bde Add Whoosh index 2016-12-20 14:46:08 +01:00
c372b22197 Management for companies added 2016-12-20 12:29:13 +01:00
Skia
68517a5d33 Merge branch 'Tresorerie' into 'master'
Separate counter for account refounding

See merge request !28
2016-12-19 16:50:44 +01:00
Skia
352b8f0b4f Add recursive option to apply rights in the SAS 2016-12-18 19:08:25 +01:00
Skia
94e740fb04 Small improvement in file prop view 2016-12-18 17:59:08 +01:00
Skia
4a7df31f5e Some other performance improvements 2016-12-18 11:55:45 +01:00
Skia
bf6483039d Fix performance issue in rights check 2016-12-18 11:55:03 +01:00
Skia
8de0d54940 Allow to delete a launderette slot 2016-12-15 16:11:43 +01:00
7227a5d6f9 Refactor refounding function 2016-12-15 12:17:19 +01:00
e231c612c6 Separate counter for account refounding 2016-12-15 11:46:36 +01:00
Skia
39b7349034 Add CSS to the notifications 2016-12-14 19:15:53 +01:00
Skia
81e11b4c33 Refactor Can*Mixin 2016-12-14 18:05:30 +01:00
Skia
642249e7fb Notification fix 2016-12-14 09:11:26 +01:00
Skia
97f7214f01 Small right fix 2016-12-14 09:10:41 +01:00
Skia
e3c86c1d05 Add "Mark all as read" 2016-12-13 17:53:44 +01:00
Skia
bf9aa29a54 Add clipboard to SAS 2016-12-13 17:17:58 +01:00
Skia
f594a99751 Clean up, fix, and improve templates around clipboard 2016-12-13 01:24:23 +01:00
Skia
0859648bd4 Add cut/paste function in files 2016-12-13 00:45:38 +01:00
Skia
8b63fa9aea Store file moderator 2016-12-12 17:23:06 +01:00
Skia
2919f3a133 Allow former subscribers to see pictures 2016-12-12 16:35:52 +01:00
Skia
7be4f00440 Fix is_in_group 2016-12-11 17:51:44 +01:00
Skia
28431ec9be Big refactor: remove Subscriber class 2016-12-10 01:58:30 +01:00
Skia
0d4b697079 Refactor group settings 2016-12-10 01:29:56 +01:00
Skia
1649d14518 Fix migration scripts 2016-12-10 00:30:52 +01:00
Skia
d92a706920 Refactor notifications 2016-12-10 00:06:17 +01:00
Skia
b53531c391 Add another method to moderate pictures in SAS 2016-12-09 19:35:23 +01:00
Skia
66d73d69ec Improve SAS moderation page 2016-12-09 18:42:02 +01:00
Skia
4542753812 Add two tests for file upload 2016-12-09 15:48:17 +01:00
Skia
80fa99d2ac Add notification 2016-12-08 19:47:28 +01:00
Skia
c1397ef5a5 Small fix, episode two 2016-12-08 15:30:41 +01:00
Skia
b7b9820d70 Revert "Père 200, Père 200, tralalalalère!!!!"
This reverts commit edaa1b0082.
2016-12-06 12:37:25 +01:00
Skia
edaa1b0082 Père 200, Père 200, tralalalalère!!!! 2016-12-05 02:58:53 +01:00
Skia
3970965781 Merge branch 'Tresorerie' into 'master'
Refound Account

See merge request !26
2016-11-30 15:44:43 +01:00
Skia
8771cc9b86 Enhance user picture view 2016-11-30 12:59:03 +01:00
Skia
7453b857fb Add thumbnails to albums 2016-11-30 09:28:54 +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
a60063f009 Oops, syntax error + styling footer 2016-11-29 11:49:41 +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
064abe0741 UTF-8 fix 2016-11-25 18:59:22 +01:00
Skia
cfbb6f4e1f Lot of small improvement in SAS 2016-11-25 13:47:09 +01:00
Skia
0b23d39e15 Fix migrations after rebase 2016-11-23 11:55:10 +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
815ef03860 Better handle rotations 2016-11-23 11:46:45 +01:00
Skia
869634d6e1 Add thumbnail generation 2016-11-23 11:46:45 +01:00
Skia
71d22e367b Add picture view to users 2016-11-23 11:46:45 +01:00
Skia
22ab21e4e1 Add picture-people relation and ask for removal thing 2016-11-23 11:46:45 +01:00
Skia
b619619b85 Improve moderation tool in SAS 2016-11-23 11:46:45 +01:00
Skia
157b1e4c78 Add file moderation tool 2016-11-23 11:46:45 +01:00
Skia
585ba55e5e Continue SAS 2016-11-23 11:46:40 +01:00
Skia
d554a5ee8d Begin SAS 2016-11-23 11:38:01 +01:00
Skia
0b068d3e92 Improve file moderation 2016-11-23 11:30:57 +01:00
Skia
9e32840549 Add file moderation tool 2016-11-23 00:51:20 +01:00
Skia
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
Skia
e98ffb5cd5 Fix unappropriate behavior when delete selling 2016-11-10 13:51:56 +01:00
guillaume-renaud
63f10c13d4 Add inactive state for counters 2016-11-08 18:42:12 +01:00
Skia
54d3ca8e65 Merge branch 'sli' into 'master'
Edit CONTRIBUTING instructions

See merge request !20
2016-11-06 23:27:00 +01:00
160c7806df Fix contributing.md and fix quantity display on eticket 2016-11-06 23:15:43 +01:00
Skia
20ff409547 Fix tests 2016-11-06 11:36:54 +01:00
Skia
59f5917b8c Fix Page locking 2016-11-05 13:37:39 +01:00
Skia
9cfc029fb2 Permission fix 2016-10-27 18:39:40 +02:00
b00fc23fc4 Add automatic mail when an eticket has been bought 2016-10-21 17:47:56 +02: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
c40171fe86 Clean permission check for alcohol and counter ban 2016-10-18 23:02:53 +02:00
2daaf992f2 Add groups, allow to ban users from counters and from buying alcohol 2016-10-16 03:45:06 +02:00
1c97c8a74f Swag dropdown on user account + autofocus for refillings on counters 2016-10-16 02:47:21 +02:00
257cb9cfe7 Add ban for alcohol 2016-10-15 02:33:38 +02:00
178a4af196 Add lazy way to make an user property editable once only 2016-10-13 22:58:26 +02:00
579c25d63a Deny date of birth, first and last name modification for non board or root user 2016-10-13 22:32:13 +02:00
Skia
5931351c0a Another tiny template improvement 2016-10-12 12:32:04 +02:00
d285fbe04a Add account number and suscription on counter 2016-10-08 23:07:10 +02:00
guillaume-renaud
5b50cc9598 Traduction's addition for user_clubs templates 2016-10-07 13:17:43 +02:00
guillaume-renaud
760b33728b Addition of the user's club tab as table 2016-10-06 11:08:32 +02:00
guillaume-renaud
1b63d58586 Addition of the user's club tab 2016-10-06 11:08:32 +02:00
Skia
63217b2ead Improve product display 2016-10-05 15:57:04 +02:00
Skia
64b4484620 Some templating 2016-10-04 00:41:08 +02:00
Skia
cd23fdf3ef Add missing eticket banner 2016-10-03 19:43:22 +02:00
Skia
d6138a7a0c Make the etickets 2016-10-03 19:30:05 +02:00
Skia
52184c4012 Merge branch 'sli' into 'master'
Godfathers deletion



See merge request !11
2016-09-29 15:12:19 +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
Skia
2e7e78b8ce Add last ops view to the bars 2016-09-28 11:09:54 +02:00
8ef45bf03c Rename is_token to check_token 2016-09-28 10:53:27 +02:00
17b098ca2a Fixed lookup for loged barmen 2016-09-27 22:57:06 +02:00
Skia
f152791d90 Merge branch 'sli' into 'master'
Only club members can view counter's stats

N'importe qui peut accéder aux tops 100, c'est pas très cool de voir ce que dépensent les autres…

See merge request !9
2016-09-27 20:12:57 +02:00
3c408551aa Remove nested exception for stats and added property on AnonymusUser 2016-09-27 16:56:30 +02:00
Skia
a4ad7f0e85 Add token to counter to see pictures and to prevend misuses 2016-09-26 11:17:56 +02:00
Skia
37072e1640 Clean up some useless prints 2016-09-26 11:17:55 +02:00
Skia
7a2985b186 Add product top 10 2016-09-26 11:17:55 +02:00
Skia
24d744ee9c Merge branch 'krophil' into 'master'
Krophil

Few changes in css

See merge request !7
2016-09-26 09:25:13 +02:00
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
380f41445a Modify property names 2016-09-22 13:07:22 +02:00
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
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
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
1d9c058132 Revert "radius removed"
This reverts commit 26a1300417.
2016-09-20 17:12:09 +02:00
62c4036dee radius removed 2016-09-20 13:22:05 +02:00
b11c5bbd1d Merging 2016-09-20 13:19:44 +02:00