Skia
4ca3aebc77
core: improve alert and info boxes
...
Signed-off-by: Skia <skia@libskia.so>
2017-09-02 02:06:22 +02:00
Skia
5c709a5416
core: great rework of the header bar
...
Signed-off-by: Skia <skia@libskia.so>
2017-09-01 18:31:48 +02:00
Skia
22151ef3b3
core: display news page in place of index for logged in users
...
Signed-off-by: Skia <skia@libskia.so>
2017-09-01 12:33:23 +02:00
Skia
4edb9a78c6
com: add agenda on news page
...
Signed-off-by: Skia <skia@libskia.so>
2017-09-01 12:22:38 +02:00
2bd1927e39
New Sponsors page
2017-08-31 14:11:18 +02:00
Skia
5504142efa
core, templates: fix logo link
...
Signed-off-by: Skia <skia@libskia.so>
2017-08-25 14:28:17 +02:00
Skia
0d5595c683
core: add test for Markdown syntax
...
Signed-off-by: Skia <skia@libskia.so>
2017-08-24 16:30:46 +02:00
Skia
30f650ecce
core: use more AJAX forms in admin UI
...
Signed-off-by: Skia <skia@libskia.so>
2017-08-24 15:35:17 +02:00
c0b3024cc2
Merge branch 'mailing' into 'master'
...
Fix permission for club in user profile
See merge request !102
2017-08-24 14:49:04 +02:00
b0ce8b1b83
Fix permission for club in user profile
2017-08-24 14:42:57 +02:00
8e166b75e4
Merge branch 'nintendo_switch' into 'master'
...
Changing urls
See merge request !99
2017-08-22 23:53:56 +02:00
b74600b3f3
Changing urls
2017-08-22 23:47:55 +02:00
4f6109e27c
Refactor mailings email
2017-08-22 22:39:12 +02:00
d179a0a6d0
Fix typo and merge migrations
2017-08-22 15:36:39 +02:00
ce9e17ea24
Some mailing list fixs
2017-08-22 15:36:39 +02:00
76efb91e40
Move mailing list admin to com
2017-08-22 15:36:39 +02:00
3a6f7009fd
Fix display rights in user profile for mailing
2017-08-22 15:36:39 +02:00
9cb88a878d
Even better mailing
2017-08-22 15:36:39 +02:00
a9e23920ee
Matmat renames
2017-08-15 18:05:07 +02:00
9ff8f02a45
Form remember last entered values
2017-08-15 18:05:07 +02:00
b7c382a1a8
Basic search structure
2017-08-15 18:05:07 +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
22407e2f85
Bottom links migrations to internal wiki
2017-08-15 03:30:39 +02:00
Skia
6f79c6c590
core: fix paragraph annoying scroll bar
...
Signed-off-by: Skia <skia@libskia.so>
2017-08-09 22:02:41 +02:00
Skia
d3796479ee
core: put the AE logo in the CSS
...
Signed-off-by: Skia <skia@libskia.so>
2017-08-09 16:40:03 +02:00
Skia
61d2765510
core: refactor user picture page algorithm
...
Signed-off-by: Skia <skia@libskia.so>
2017-08-02 20:12:41 +02:00
Skia
e4e4eae11b
Merge branch 'subscriptions' into 'master'
...
Some selected club members can now make people subscribe and fix major security …
Le bdf m'as demandé si c'était possible pour eux de faire des cotisations pour les nouveaux
Je retire WIP quand j'ai la confirmation du bureau que je peux faire ça
Par contre il j'y ai patché une grosse faille de sécurité : se mettre curieux à l'AE suffit à avoir tous les droits de board_member
See merge request !91
2017-07-26 20:48:01 +02:00
c56094eaaf
Some selected club members can now make people subscribe and fix major security hole in board_member verification
2017-07-26 20:31:29 +02:00
Skia
b99bbc385a
css: fix overflow problem
...
Signed-off-by: Skia <skia@libskia.so>
2017-07-26 18:41:21 +02:00
2ae4e36eea
Add a nice favicon
2017-07-06 14:04:24 +02:00
e7de8b2aec
Format core
2017-06-13 10:04:13 +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
5df9be9188
Move computing of start of semester to core/utils
...
Signed-off-by: Skia <skia@libskia.so>
2017-06-12 22:53:25 +02:00
Skia
8ca455a398
Epic fix
...
Signed-off-by: Skia <skia@libskia.so>
2017-06-12 22:35:22 +02:00
Skia
37a5db537b
Re-fix AnonymousUser
...
Signed-off-by: Skia <skia@libskia.so>
2017-06-12 14:01:28 +02:00
Skia
b06f270ea5
Revert "Fix AnonymousUser"
...
This reverts commit e7f7c57558
2017-06-12 13:57:08 +02:00
Skia
b4be40a3a7
Change the Markdown super and sub texts not to break the Ragots
...
Signed-off-by: Skia <skia@libskia.so>
2017-06-10 21:39:56 +02:00
Skia
58beb551e8
Fix unread messages in topic
...
Signed-off-by: Skia <skia@libskia.so>
2017-06-10 21:05:36 +02:00
Skia
a89fb23d33
That's just a ridiculous little fix
...
Signed-off-by: Skia <skia@libskia.so>
2017-06-10 20:03:37 +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
2925cde8ab
Add a MarkdownInput widget, and make use of it
...
Signed-off-by: Skia <skia@libskia.so>
2017-06-10 19:40: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
Skia
1bcde80a28
Fix cache clearing
...
Signed-off-by: Skia <skia@libskia.so>
2017-06-07 22:51:17 +02:00
Skia
23293ea88e
Small style update to improve Markdown rendering
...
Signed-off-by: Skia <skia@libskia.so>
2017-06-07 22:49:59 +02:00
Skia
10ee5e1708
Merge branch 'counter' into 'master'
...
Tests for counter
See merge request !77
2017-06-07 19:45:05 +02:00
c4389bb9cd
Add a way for admin to delete elections and add archive system
2017-06-07 18:42:16 +02:00
0076c9cdb4
Macro for pagination
2017-06-07 18:39:42 +02:00
0af72500c6
Add some tests on counter
2017-06-07 18:36:26 +02:00
Skia
63acf588ca
Add basic unfinished counter test
2017-06-07 18:36:26 +02:00
22945483d6
Add some graphics for subscriptions stats
2017-06-07 14:12:03 +02:00
1c05671784
Added forgotten column and a link in tools
2017-06-06 22:03:56 +02:00
Skia
e7f7c57558
Fix AnonymousUser
...
Signed-off-by: Skia <skia@libskia.so>
2017-06-06 19:37:45 +02:00
Skia
f3c1ab4ae4
forum: use short names
...
Signed-off-by: Skia <skia@libskia.so>
2017-05-31 23:56:47 +02:00
Skia
978b891137
Add a cache clearing mechanism to fix rights update problems
...
Signed-off-by: Skia <skia@libskia.so>
2017-05-31 21:49:54 +02:00
Skia
e5ce9658ee
Fix images and links parsing in doku_to_markdown
...
Signed-off-by: Skia <skia@libskia.so>
2017-05-31 19:13:43 +02:00
Skia
136d0f3fa0
Add basic BBcode translator
...
Signed-off-by: Skia <skia@libskia.so>
2017-05-30 23:40:01 +02:00
Skia
ba65dc5d46
Fix doku_to_markdown
...
Signed-off-by: Skia <skia@libskia.so>
2017-05-30 19:33:09 +02:00
Skia
d7135e4d27
Make a lot of pimp in the Forum
2017-05-30 19:33:09 +02:00
Skia
cf062a35d3
Add query reductions in core
2017-05-30 19:33:09 +02:00
Skia
862a4619b3
Add doku_to_markdown function
2017-05-14 03:17:42 +02:00
Skia
8c151fa498
Add support for image sizing in Markdown
2017-05-14 01:03:50 +02:00
Skia
231cb236dc
Add moderation tool to Trombi
2017-05-12 18:42:52 +02:00
Skia
d913b8b64f
Some more pimp in Trombi + translations
2017-05-10 23:30:20 +02:00
Skia
35f983131f
Improve Trombi again with pictures, notifs, and style!
2017-05-10 23:05:05 +02:00
Skia
f2b2ff533d
Rename Matmat to Trombi
2017-05-10 22:17:05 +02:00
Skia
b3bc33a319
Add first Matmat' app
2017-05-10 19:19:33 +02:00
05d1f43b55
Few modifications in accordance with com
2017-05-10 15:32:50 +02:00
e59d769dac
Doc for scss
2017-05-10 11:13:49 +02:00
200af57971
Put scss in renderer
2017-05-10 10:49:34 +02:00
f87ec1e395
Better lisibility for scss
2017-05-10 10:49:34 +02:00
d083a67725
Change year of license on some files
2017-05-10 10:49:34 +02:00
acef5be8b3
New lite home made scss processor
2017-05-10 10:49:34 +02:00
630fdf93a4
Refactoring for compilestatic
2017-05-10 10:49:34 +02:00
79c769351d
Add simple way to compile scss files
2017-05-10 10:49:34 +02:00
ee7fd1c423
Rename temporary_design
2017-05-10 10:49:34 +02:00
2048f27d58
New temporary design
2017-05-10 10:49:34 +02:00
Skia
a12b772587
Add some Eboutic tests
2017-05-01 19:39:28 +02:00
Skia
58fdb36911
Merge branch 'Elections' into 'master'
...
Some tests for election
See merge request !47
2017-05-01 15:58:49 +02:00
d7305488b6
Add new banner
2017-04-28 13:59:10 +02:00
7815796d8b
New css for weekmail
2017-04-27 15:31:18 +02:00
b5363c2987
Firsts tests for elections
2017-04-25 15:30:57 +02:00
Skia
20deda8a8e
Merge branch 'master' into stock
2017-04-24 18:07:25 +02:00
Skia
83deae5964
Apply GPLv3 to Sith, and add header to every concerned file
2017-04-24 17:51:12 +02:00
Skia
44dacce9f2
Add forum signature
2017-04-12 19:38:54 +02:00
Skia
3aa5070a38
Add preview button in the Forum
2017-04-12 19:26:27 +02:00
Skia
231922cbaa
Merge branch 'sas' into 'master'
...
Fixed some issues with filepaths and see the future with some preload
See merge request !59
2017-03-31 11:34:10 +02:00
60e2e0d4f9
Better to use os.path.join for paths
2017-03-30 19:13:47 +02:00
8787e5e708
Better protection for stats
2017-03-28 15:00:09 +02:00
63506b1506
Protect stats from other users
2017-03-28 01:03:31 +02:00
5eb1e609cc
Fixed tests issues
2017-03-27 22:47:24 +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
39b32d456c
Some com templates improvments and reordering some models
2017-03-24 09:19:15 +01:00
Skia
d2da5716ba
Automodere profile files
2017-03-24 08:43:13 +01:00
Skia
e56b2476b7
Fix notifications local time
2017-03-17 18:11:30 +01:00
95775d3b9b
adaptations for settings and deletion checked
2017-03-11 11:57:37 +01:00
554929b4ec
small fix in canViewList
2017-03-11 11:57:37 +01:00
95f984824a
Fix accents in wiki page name and allow to delete a page
2017-03-08 14:11:56 +01:00
86c74b22de
Fix sas rights
2017-02-26 17:35:01 +01:00
Skia
7d99f02a4d
forum: reply page, CSS, and first_unread fix
2017-02-25 14:38:10 +01:00
Skia
777fdd7bd5
Again, lot of forum improvements
2017-02-24 17:22:13 +01:00
Skia
fe07ee0963
Still lot of forum improvements, both rights and cosmetic
2017-02-24 15:55:50 +01:00
Skia
d6b5db4a4b
Sanitize page name
2017-02-24 04:36:36 +01:00
Skia
4d6c4314e2
Bugfix with property/callable
2017-02-24 04:36:10 +01:00
Skia
59dfcbd567
Merge branch 'forum' into 'master'
...
Forum
See merge request !49
2017-02-24 03:08:07 +01:00
Skia
dea234f98a
Change is_subscriber and was_subscriber to cached_properties
2017-02-24 02:59:59 +01:00
Skia
11e05050f7
Fix tests and force Markdown renderer to escape HTML
2017-02-24 02:45:37 +01:00
Skia
daee59f772
Change spans to sub and sup markups
2017-02-24 02:04:39 +01:00
Skia
5f1e4ebede
Merge branch 'markdown' into forum
2017-02-24 02:02:59 +01:00
Skia
5897318cc6
Fix user picture view with Jinja update
2017-02-24 01:52:26 +01:00
Skia
a4abf50d18
Allow former subscribers to see user profiles
2017-02-24 01:52:26 +01:00
Skia
1e95fb6873
Make use of cached_property in User model
2017-02-24 01:50:14 +01:00
Skia
6764224856
Fix quote answer and unread messages display
2017-02-24 01:49:48 +01:00
Skia
318c9ff9ad
Add trigger to update Whoosh index on User update
2017-02-15 22:01:33 +01:00
Skia
52a671583e
Fix blockquote
2017-02-07 00:10:00 +01:00
Skia
ecbfe0822f
Another version of the indice/exposants
2017-02-06 20:21:34 +01:00
Skia
579a68362d
Add some rules
2017-02-06 20:21:34 +01:00
Skia
254126fd79
Add last unread function
2017-02-06 20:20:39 +01:00
Skia
bf8a2a03ff
Allow former subscribers to lookup people
2017-02-02 22:56:05 +01:00
Skia
653d9d4707
Some other great forum improvements
2017-01-21 22:47:30 +01:00
Skia
93f5096140
Improve forum style and templates
2017-01-21 12:28:32 +01:00
Skia
ff77df3646
Add basic right management to forum. Need to test it!
2017-01-21 04:51:37 +01:00
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
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
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
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
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
b1f6754e6e
Refactor lots of tabed templates, and create TabedViewMixin
2016-09-04 19:25:03 +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
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
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
Skia
fe2438ef0c
Fix subscription right and typo
2016-08-29 19:48:29 +02:00
Skia
3667a12174
Fix webcam upload
2016-08-29 04:58:25 +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
dfb13c37f2
Add INSERT to old DB for subscriptions and users
2016-08-29 02:19:29 +02:00
Skia
e61b5e7690
Small fixes
2016-08-29 01:31:58 +02:00
Skia
3e0b964e9b
Small AnonymousUser fix (le gaulois)
2016-08-26 21:09:32 +02:00
Skia
9927310f6e
Update login system to support the multiple threads of UWSGI
2016-08-26 20:56:16 +02:00
Skia
bea7b71f2c
Delete unwanted obsolete migration files
2016-08-24 22:10:58 +02:00
Skia
4f67bf4c04
Reset all migrations and migrate companies
2016-08-24 22:09:23 +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
a4df1ae9a5
Add language chooser
2016-08-24 19:11:09 +02:00
Skia
f2c3c7dc25
Add viewable flag for user
2016-08-22 18:44:03 +02:00
Skia
eef5dfd275
Make JPEG progressive when resizing
2016-08-22 14:21:17 +02:00
Skia
8e3eb1e2bf
Some templating and add webcam support for profile editing
2016-08-22 02:56:27 +02:00
Skia
4cbfd58660
Add pictures to products
2016-08-21 03:07:15 +02:00
Skia
a49d9850ab
Pimp the counter click view
2016-08-21 02:30:49 +02:00
Skia
7797f87dd0
Clean up some useless prints
2016-08-20 22:15:54 +02:00
Skia
dbf0653baf
Add support for product buying groups + many cosmetics and form pimping
2016-08-20 22:12:46 +02:00
Skia
62745e89fa
User profile template fix
2016-08-20 13:57:27 +02:00
Skia
84efcd87e7
Translate datepicker and add age limit to products
2016-08-20 02:55:48 +02:00
Skia
7e90e657a7
Add ajax-select app and improve some templates
2016-08-19 23:24:23 +02:00
Skia
da96e9da84
Search improvement
2016-08-19 03:12:20 +02:00
Skia
f1105d704e
Add basic search bar
2016-08-19 02:53:44 +02:00
Skia
0689f864d2
Migrate permanencies and add user stats view
2016-08-18 21:32:18 +02:00
Skia
b69c3a6792
Improve and fix user accounts
2016-08-18 21:06:10 +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
d4f87e7581
Improve file popup
2016-08-15 21:04:06 +02:00
Skia
66fdf6cbf7
Migrate and improve subscriptions
2016-08-14 19:28:14 +02:00
Skia
e1474c7a74
Add is_root property to user
2016-08-14 04:35:08 +02:00
Skia
792563999b
Allow root to reset user password
2016-08-13 17:15:45 +02:00
Skia
a033c4dfd2
Improve launderette rights to match with launderette club
2016-08-13 16:39:09 +02:00
Skia
4ec328556e
Migrate clubs
2016-08-13 16:08:22 +02:00
Skia
c0a66f9a38
Finish profile of users
2016-08-13 05:33:09 +02:00
Skia
5113d8fda5
Small user profile fix
2016-08-11 04:57:07 +02:00
Skia
43b709bfd5
Make file modale chooser and complete user profile
2016-08-11 04:30:24 +02:00
Skia
a8858fa781
Add home for users and clubs
2016-08-10 16:23:12 +02:00
Skia
830c15a585
Better right handling in files
2016-08-10 14:48:18 +02:00
Skia
1775569ecf
Reset all migrations
2016-08-10 13:52:57 +02:00
Skia
792d66da33
Add nice whole file support
2016-08-10 05:48:06 +02:00
feb7b4689b
First steps with the api
2016-08-07 20:45:06 +02:00
Skia
ad36c1c6f6
Better handle 403 with next argument
2016-08-07 20:36:06 +02:00
Skia
a0f7150c55
Update accounting to have a target
2016-08-07 20:10:50 +02:00
Skia
31ecb50c1d
Move user account view into core
2016-08-05 09:52:19 +02:00
Skia
db712c86b8
Fix tests
2016-08-02 22:20:06 +02:00
Skia
7002139176
Finish the launderette click view
2016-08-02 00:32:55 +02:00
Skia
2cf39671e2
Make some more validation on the token click form
2016-08-01 19:59:22 +02:00
Skia
4d8e7b0875
Improve launderette, need to finish the click view
2016-08-01 16:36:16 +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
f230fbc135
Add product management views
2016-07-27 17:23:02 +02:00
Skia
4e6b592911
Fix eboutic
2016-07-26 19:58:36 +02:00
Skia
c099f1c5d7
Make eboutic working
2016-07-26 18:28:36 +02:00
Skia
a0322fa931
Templating pages
2016-07-22 02:05:29 +02:00
Skia
f04cf9d4d4
Add basics of eboutic, still need to implement the ET API to get bank payment
2016-07-22 01:19:50 +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
28aa143f39
Improve Operation numbering in accounting
2016-07-20 18:48:18 +02:00
Skia
150147c69f
Fix the removing of built in permissions for admin app
2016-07-20 16:34:18 +02:00
Skia
97ff4341a7
Translate most of the Sith
2016-07-19 19:03:16 +02:00
Skia
2147f6a468
Add permanencies tracking to counters
2016-07-18 13:22:50 +02:00
Skia
593050d9e2
Improve greatly the counter right management
2016-07-18 00:47:56 +02:00
Skia
e92a73dfb1
Add basic account view for user and refactor user tool bar
2016-07-17 12:38:02 +02:00
Skia
14595936e2
Some design
2016-07-17 11:37:52 +02:00
Skia
f600e174b1
CSS and templating, Sith begins to look nice
2016-07-16 16:35:45 +02:00
Skia
67114f51e1
Fix populate to work with Postgres
2016-07-14 17:51:26 +02:00
Skia
0eb203b18b
Fix populate with subscriptions
2016-07-14 16:13:43 +02:00
Skia
0248bdf6d1
Update SubscriptionForm to allow creating user on the fly
2016-07-07 00:52:30 +02:00
Skia
5355492c76
Date of birth is no longer mandatory
2016-07-06 01:09:31 +02:00
Skia
e9544f2581
Update CanCreateView and fix accounting views in consequence
2016-06-24 21:07:59 +02:00
Skia
1396f2ca84
Improve accounting ease of use
2016-06-24 19:59:49 +02:00
Skia
d244618dd0
Improve accounting views
2016-06-22 13:19:35 +02:00
Skia
3023d6d744
Add CanCreateMixin, and add amount in journals
2016-06-20 15:47:26 +02:00
Skia
ffe2aec980
Implement barman prices and improve counter views
2016-06-01 01:33:20 +02:00
Skia
6c48b7c718
Add Selling and Refilling classes
2016-05-31 19:32:15 +02:00
Skia
356a2d2683
Refactor page handling
2016-05-31 13:00:52 +02:00
Skia
8da149c979
Some refactoring between accounting and counter
2016-05-31 13:00:52 +02:00
Skia
e75da927c3
Improve group views
2016-05-31 13:00:52 +02:00
Skia
27805640a1
Improve right handling for accounting
2016-05-09 11:49:01 +02:00
Skia
39661b8de7
Add new club view
2016-05-03 12:06:03 +02:00
Skia
6ef39257ee
Fix user template
2016-05-03 09:01:54 +02:00
Skia
6e05207e84
"Finish" the accounting views
2016-05-03 08:50:54 +02:00
Skia
9c0b17a9ae
Fix custom special views 403,404 to return the right HTTP code
2016-05-02 11:33:38 +02:00
Skia
b4c3f2f4dc
Fix tests
2016-04-20 03:30:49 +02:00
Skia
c6a3559bf5
Improve accounting model according to current site's one
2016-04-20 02:07:01 +02:00
Skia
20a97526d4
Make counter login forms
2016-04-12 10:00:47 +02:00
Skia
52153438ac
Rename and refactor some settings
2016-03-31 10:36:00 +02:00
Skia
debba55350
Add MetaGroup system
2016-03-29 12:45:10 +02:00
Skia
5bcc94f992
Improve counters views
2016-03-29 10:30:48 +02:00
Skia
21f1393097
Add basic counter model
2016-03-28 14:54:35 +02:00
Skia
7d7652e319
Small fix (le gaulois)
2016-03-24 11:55:39 +01:00
Skia
c3fb581f97
Refactor a bit right handling
2016-03-22 17:46:26 +01:00
Skia
2e84ee7d4f
Fix subscription and improve views
2016-03-22 11:42:00 +01:00
Skia
0dba76e02e
Make some tests for clubs
2016-03-22 09:01:24 +01:00
Skia
fe8f5bb2e3
Fix club rights
2016-03-15 18:26:03 +01:00
Skia
e2b0668ee8
Improve Club views
2016-02-08 17:09:52 +01:00
Skia
a14d940db2
Some refactoring and misc improvements
2016-02-05 16:59:42 +01:00
Skia
d51ab088d8
Add first club views, this still sucks, particularly on the right managment
2016-02-02 16:34:36 +01:00
Skia
afc87888a6
Finish the move to Jinja2
2016-02-02 11:00:08 +01:00
Skia
239133e355
Fix generate_username for accents
2016-02-02 10:59:00 +01:00
Skia
6b81210ba1
Fix permissions Mixins
2016-02-02 10:15:50 +01:00
Skia
03bc0973fe
WIP: Move to Jinja2
2016-02-01 17:35:55 +01:00
Skia
abb8dc0c5e
Add Subscription to setup
2016-02-01 09:55:23 +01:00
Skia
4322318c31
Club model implementation, various other changes
2016-01-29 15:20:00 +01:00
Skia
8fc360a977
Improve subscription and add it to admin app
2016-01-28 17:42:22 +01:00
Skia
f71ce2f7df
Add first accounting implementation
2016-01-28 16:53:37 +01:00
Skia
2b999d87ba
Another date field update
2016-01-28 10:13:45 +01:00
Skia
367fddbdab
Alter date_of_birth
2016-01-28 09:36:24 +01:00
Skia
8ea1727475
Fix URLs
2016-01-11 10:13:30 +01:00
Skia
8b0939ca79
Core: rename full_name in _full_name because this attribute is for internal use only
2016-01-11 10:02:41 +01:00
Skia
1f4c49ac49
Make a previsualization button in page edit
2016-01-11 09:56:42 +01:00
Skia
771056d6e4
Add a begining of API and CSS+JS (static files folder)
2016-01-08 17:11:38 +01:00
Skia
f5b07887a5
Fix typo in setup
2016-01-08 16:27:59 +01:00
Skia
8ebd6c64a7
Add Markdown support and better url tolerance for pages
2016-01-08 16:15:06 +01:00
Skia
a6aac76d75
Alter date_join field in User
2015-12-15 09:27:50 +01:00
Skia
787fd2f484
Settingize some stuff and add custom AnonymousUser
2015-12-14 15:43:30 +01:00
Skia
a6edfcc048
Update UserPropForm
2015-12-14 10:49:15 +01:00
Skia
376b5101c1
Add docstring to PageRev
2015-12-09 11:22:50 +01:00
Skia
268a33255b
Refactor user groups to user prop
2015-12-09 11:01:11 +01:00
Skia
77803596fb
Add class wide permissions and clean up migrations
2015-12-09 10:33:55 +01:00
Skia
e3cbe70319
WIP: Improve many views and a bit user permissions (idea for class scale perm)
2015-12-08 17:22:50 +01:00
Skia
475bff14cb
Refactor rights handling
2015-12-08 11:10:29 +01:00
Skia
dc37e79f14
WIP: Refactor permissions
2015-12-08 09:46:48 +01:00
Skia
f7bfd6daed
Add getattribute to PageRev for getting owner_group&co
2015-12-08 09:46:40 +01:00
Skia
aa732a4ec0
WIP: Add custom 403 and 404, but break a bit the permissions! To be fixed
2015-12-07 17:23:52 +01:00
Skia
6cc7851487
Repair all tests and update requirements.txt
2015-12-07 16:08:24 +01:00
Skia
185b35ed18
Improve setup script
2015-12-04 16:14:05 +01:00
Skia
2557af270a
Merge branch 'krophil'
2015-12-03 20:33:40 +01:00
f3896cb22e
SimpleTestCase -> TestCase. Now, test are almost ok
2015-12-03 18:41:22 +01:00
Skia
2c4bac7c9f
Add setup custom command to manage.py
2015-12-03 18:00:08 +01:00
Skia
5f07237d70
Improve a bit user views's rights
2015-12-03 16:47:03 +01:00
