|
f922ab9272
|
Merge branch 'bugfix' into 'master'
counter: fix error for stats 500 on PermissionDenied
See merge request ae/Sith!208
|
2019-06-14 16:32:34 +02:00 |
|
|
f0524a9f00
|
counter: fix error for stats 500 on PermissionDenied
|
2019-05-28 16:39:16 +02:00 |
|
|
d466d645e6
|
Merge branch 'eboutic' into 'master'
eboutic: add some help and documentation for the payment system
See merge request ae/Sith!207
|
2019-05-27 11:42:37 +02:00 |
|
|
8129e6923a
|
eboutic: add some help and documentation for the payment system
|
2019-05-27 11:20:57 +02:00 |
|
|
c219e47621
|
Merge branch 'nfc_card' into 'master'
fix a bug where you can't register UID card with only number inside
See merge request ae/Sith!206
|
2019-05-24 09:07:51 +02:00 |
|
|
1f3220246a
|
counter: fix a bug where you can't register UID card with only number inside
|
2019-05-24 08:38:15 +02:00 |
|
|
0f832a2774
|
Merge branch 'nfc_card' into 'master'
Can identify user on counter with student card UID
See merge request ae/Sith!172
|
2019-05-23 19:49:45 +02:00 |
|
|
b4c24ee997
|
Merge branch 'bugfix' into 'master'
counter: fix SellingFormBase import
See merge request ae/Sith!205
|
2019-05-21 11:08:07 +02:00 |
|
|
275b89cdf0
|
club: fix SellingFormBase import
|
2019-05-21 10:53:18 +02:00 |
|
|
3bddf176d8
|
Fix typo for NFC cards
|
2019-05-20 19:12:53 +02:00 |
|
|
19e353970d
|
Enforce uid with uppercase for Studentcard and test more edge cases
|
2019-05-20 17:56:14 +02:00 |
|
|
5ae7d10e84
|
Add unit tests for student cards and fix edge cases
|
2019-05-20 17:56:09 +02:00 |
|
|
e1ffdbe3f9
|
Translations on student card feature
|
2019-05-20 17:55:58 +02:00 |
|
|
0ba0df0f29
|
Better handling of user rights for studentcards
|
2019-05-20 17:52:44 +02:00 |
|
|
616b7ccfc8
|
Nice user interface and permission rework
|
2019-05-20 17:52:39 +02:00 |
|
|
4669e5a4e9
|
Gui for studentcards in counters
|
2019-05-20 17:52:36 +02:00 |
|
|
14d9fc04d1
|
Stronger bdd validation for studentcards
|
2019-05-20 17:52:33 +02:00 |
|
|
577ad07a2b
|
Can identify user on counter with student card UID
|
2019-05-20 17:52:29 +02:00 |
|
|
9f2a0deeb9
|
Merge branch 'mailing' into 'master'
Enhance mailing list edition for clubs with brand new form
See merge request ae/Sith!200
|
2019-05-20 17:39:43 +02:00 |
|
|
c26d1c423e
|
Merge branch 'markdown-editor' into 'master'
Remove external resources once for all
See merge request ae/Sith!204
|
2019-05-18 03:41:35 +02:00 |
|
|
e8f742b9f9
|
core: remove external resources once for all
|
2019-05-18 03:00:19 +02:00 |
|
|
8ebf5af3d6
|
Merge branch 'markdown-editor' into 'master'
core: replace simplemde with easymde
See merge request ae/Sith!202
|
2019-05-18 02:49:36 +02:00 |
|
Cyl
|
a4ed535b34
|
core: optimisation and take off the auto-download of Font Awesome
|
2019-05-10 15:49:20 +02:00 |
|
|
827ec63ab3
|
Merge branch 'search' into 'master'
core: fix error 500 on user and forum search
See merge request ae/Sith!201
|
2019-05-10 11:06:13 +02:00 |
|
|
81d470b977
|
clubs: add tests for MalingForm
|
2019-05-09 20:32:48 +02:00 |
|
|
654099067e
|
clubs: tests for adding mailings
|
2019-05-09 20:32:26 +02:00 |
|
Cyl
|
355a51d2ce
|
core: fix special caracter in user and forum search
|
2019-05-09 19:51:55 +02:00 |
|
Cyl
|
3548c3e7c4
|
change fontAwesome from extra to intra reading
|
2019-05-09 19:06:35 +02:00 |
|
|
d1fb9cc4c3
|
clubs: remove moderator and club from mailing form + display not moderated mailings
|
2019-05-09 17:43:47 +02:00 |
|
Cyl
|
ad6f17d309
|
core: replace simplemde with easymde
|
2019-05-06 20:42:35 +02:00 |
|
Cyl
|
bf06aea680
|
core: fix whitespaces in user and forum search
|
2019-05-06 20:11:49 +02:00 |
|
|
1d07195881
|
clubs: add bulk deletion on mailing lists
|
2019-05-01 22:54:18 +02:00 |
|
|
24fb714c5e
|
clubs: set club_id and user_id as mandatory arguments for MailingForm
|
2019-05-01 18:59:41 +02:00 |
|
|
da25480993
|
clubs: use standard rights for ClubMailingView
|
2019-05-01 15:50:03 +02:00 |
|
|
a0e39b8904
|
clubs: rewrite MailingForm to include everything in one place
Everything is handled on the same view, no more redirection hacks
Remove get_context_data in DetailFormView since it's already done by django
|
2019-05-01 15:49:30 +02:00 |
|
|
cfd4955672
|
clubs: clean up imports and move forms to external file
|
2019-05-01 03:32:55 +02:00 |
|
|
a12edcda15
|
Merge branch 'navbar' into 'master'
Fix footer block
See merge request ae/Sith!199
|
2019-04-30 19:40:50 +02:00 |
|
|
9e8f633037
|
core: fix footer block
|
2019-04-30 18:47:59 +02:00 |
|
|
de680f032c
|
Merge branch 'navbar' into 'master'
Update navbar with new links, remove old ones and fix translations
See merge request ae/Sith!198
|
2019-04-29 12:16:38 +02:00 |
|
|
7bd44159de
|
core: update navbar and fix some translations
|
2019-04-28 16:21:00 +02:00 |
|
|
142299c0cd
|
Merge branch 'clubs' into 'master'
Améliore la gestion de membres de clubs
See merge request ae/Sith!196
|
2019-04-26 18:19:05 +02:00 |
|
|
01803c8cf0
|
clubs: remove useless self.request_user into ClubMemberView
|
2019-04-25 19:51:30 +02:00 |
|
|
f72f0639ee
|
clubs: display a message instead of a table when no member in a club
|
2019-04-25 17:38:17 +02:00 |
|
|
68f61a432a
|
clubs: adapt tests to new display and fix form validation issue for start_date
|
2019-04-25 17:31:42 +02:00 |
|
|
3eb3565a63
|
clubs: nice display of bulk mark as old
|
2019-04-25 16:36:20 +02:00 |
|
|
75328de5ca
|
clubs: fix membership form and add bulk mark as old tests
|
2019-04-25 15:40:49 +02:00 |
|
|
6964692556
|
clubs: basic bulk mark as old
|
2019-04-24 18:17:03 +02:00 |
|
|
80f1f9699c
|
clubs: move Membership form validation outside of model and fix and add tests
|
2019-04-24 17:12:20 +02:00 |
|
|
d5ad2c5141
|
clubs: Handle bulk add of users in clubs and refresh of the form handling
|
2019-04-24 03:10:42 +02:00 |
|
|
e8ee9122f9
|
Merge branch 'admin' into 'master'
Amélioration de l'administration des groupes
See merge request ae/Sith!148
|
2019-04-23 23:06:39 +02:00 |
|