|
22a44415e4
|
Merge branch 'sli' into 'master'
core: add UserIsRootMixin and an admin delete view for memberships
See merge request ae/Sith!261
|
2019-11-25 13:32:46 +01:00 |
|
|
5c8fa1b9e7
|
core: add UserIsRootMixin and an admin delete view for memberships
|
2019-11-24 19:23:43 +01:00 |
|
|
d82679e3d7
|
Merge branch 'documentation' into 'master'
add autoreload/build to documentation server and enhace documentation
See merge request ae/Sith!246
|
2019-11-21 15:06:13 +01:00 |
|
|
9cb432a082
|
doc: correct documentation for groups
|
2019-11-21 11:11:25 +01:00 |
|
|
869d29d4a4
|
doc: corrections for populate documentation
|
2019-11-21 11:10:31 +01:00 |
|
|
c3d2e64a43
|
doc: add infos on populate command with group and users available
|
2019-11-20 18:51:13 +01:00 |
|
|
e1770ec52c
|
doc: add documentation for groups
|
2019-11-20 17:55:00 +01:00 |
|
|
1256744f1b
|
documentation: add autoreload and build for documentation server
|
2019-11-20 17:03:18 +01:00 |
|
|
77dddbc581
|
documentation: add help ressources and update installation instructions
|
2019-11-20 17:03:18 +01:00 |
|
|
bfa4000365
|
Merge branch 'eboutic' into 'master'
eboutic: don't display future account balance if contains refilling item
See merge request ae/Sith!258
|
2019-11-14 19:31:19 +01:00 |
|
|
50c2f8164d
|
Merge branch 'deletion_logs' into 'master'
Add generic operation logs and implements it for Sellings and Refilling deletions
See merge request ae/Sith!259
|
2019-11-14 19:29:55 +01:00 |
|
|
5c30de5f22
|
core: redesign request middleware with django latest design and better use of threading
|
2019-11-14 16:32:29 +01:00 |
|
|
1c03ce621f
|
core: remove default value for OperationLog
|
2019-11-14 16:11:20 +01:00 |
|
|
e634cda318
|
core/counter: add generic operation logs and implements it for Sellings and Refilling deletions
|
2019-11-14 01:14:44 +01:00 |
|
|
3501703c15
|
eboutic: don't display future account balance if contains refilling item
|
2019-11-05 19:50:08 +01:00 |
|
|
129f2e53ee
|
Merge branch 'galaRequests' into 'master'
eticketListView: product id instead of eticket id
See merge request ae/Sith!257
|
2019-11-05 11:23:52 +01:00 |
|
|
209867b3a8
|
black: makes new version happy
|
2019-11-04 13:46:09 +01:00 |
|
Robin Trioux
|
59511d255f
|
eticketListView: product id instead of eticket id
|
2019-11-03 20:58:20 +01:00 |
|
|
f42daa01c5
|
Merge branch 'add-account-amount' into 'master'
Add the account amount to the eboutic
See merge request ae/Sith!254
|
2019-10-28 23:37:33 +01:00 |
|
tleb
|
29ee1b05af
|
Merge branch 'master' into 'add-account-amount'
# Conflicts:
# locale/fr/LC_MESSAGES/django.po
|
2019-10-28 15:48:54 +01:00 |
|
|
42055b9001
|
Merge branch 'auto-uv-pedagogy' into 'master'
Auto fill UVs in pedagogy
See merge request ae/Sith!253
|
2019-10-25 12:09:39 +02:00 |
|
tleb
|
00c96f5b71
|
eboutic: fix account amount
|
2019-10-24 14:40:26 +02:00 |
|
tleb
|
5cc7eff94f
|
pedagogy: uv autofill finishing touches
|
2019-10-24 14:18:29 +02:00 |
|
|
28077ef0b0
|
Merge branch 'fix-create-club' into 'master'
club: fix 500 on club_new
See merge request ae/Sith!256
|
2019-10-22 08:34:08 +02:00 |
|
tleb
|
143b128891
|
club: fix 500 on club_new
|
2019-10-21 22:56:24 +02:00 |
|
tleb
|
6b06b647bc
|
eboutic: add p tag in makecommand
|
2019-10-21 22:10:38 +02:00 |
|
tleb
|
413c613c9f
|
Fix translation for basket account amount
|
2019-10-21 22:06:56 +02:00 |
|
tleb
|
1c0d15ba2a
|
settings: fix black report
|
2019-10-21 21:17:11 +02:00 |
|
tleb
|
28bd6b8708
|
uv: make autofill available on edit page
|
2019-10-21 17:10:16 +02:00 |
|
tleb
|
419a48ac3a
|
/pedagogy/uv/create put urls in settings
|
2019-10-21 17:01:21 +02:00 |
|
tleb
|
6fce27113a
|
/pedagogy/uv/create use quick notif
|
2019-10-21 16:52:51 +02:00 |
|
tleb
|
53a7633700
|
uv: Add error handler to uv autofill
|
2019-10-21 10:34:46 +02:00 |
|
tleb
|
4094394cef
|
api: typo in doc comment
|
2019-10-21 08:13:36 +02:00 |
|
|
f533c39e67
|
api: fix uv manager acquisition if uv is only available in spring
|
2019-10-21 02:10:09 +02:00 |
|
tleb
|
86bc491df4
|
Fix UV_endpoint auth
|
2019-10-20 18:26:11 +02:00 |
|
tleb
|
4759551c16
|
Autofull UV small changes
|
2019-10-20 17:09:36 +02:00 |
|
tleb
|
b057dbfd60
|
Initial add account amount in eboutic
|
2019-10-18 21:41:39 +02:00 |
|
tleb
|
bddb88d97f
|
Comment UV API and fix little bugs
|
2019-10-18 18:13:53 +02:00 |
|
tleb
|
dbe44a9c1c
|
Fix hour count and submit button
|
2019-10-18 01:45:49 +02:00 |
|
tleb
|
eeb791c460
|
Initial autofill on UV
|
2019-10-18 01:28:59 +02:00 |
|
|
6d0eba6bcf
|
Merge branch 'rework-front' into 'master'
Markdown widget follows the required attribute
See merge request ae/Sith!249
|
2019-10-17 14:47:56 +02:00 |
|
|
4d04b21f04
|
Merge branch 'cleanup-forms' into 'master'
Remove unused multiple-select library
See merge request ae/Sith!250
|
2019-10-17 14:46:02 +02:00 |
|
|
2f1b26053b
|
Merge branch 'fix-news-form' into 'master'
Fix 500 when a news needs a start_date and/or end_date but we don't provide
See merge request ae/Sith!252
|
2019-10-17 14:42:41 +02:00 |
|
|
1848945d64
|
Merge branch 'bugfix' into 'master'
Fix huge permission problem inducing server memory leaks for etickets
See merge request ae/Sith!251
|
2019-10-17 12:36:57 +02:00 |
|
|
9278419345
|
core: rename GenericContentPermission into GenericContentPermissionMixinBuilder
|
2019-10-17 11:56:02 +02:00 |
|
|
566dcc7aee
|
counter: fix Selling view permission
|
2019-10-17 11:24:52 +02:00 |
|
|
a6088c0e4a
|
core: refactor permissions mixins
|
2019-10-17 11:24:51 +02:00 |
|
tleb
|
60c9498a56
|
Fix 500 on news creation/edition
|
2019-10-17 10:25:29 +02:00 |
|
|
241650c171
|
counter: fix eticket server crash induced by old permission system and fix Selling permission
|
2019-10-16 21:21:51 +02:00 |
|
|
811809895e
|
club: fix mailing list form that unexpectedly relied on try catch in permissions
|
2019-10-16 21:21:06 +02:00 |
|