klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-29 20:44:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,786 Commits 24 Branches 0 Tags 106 MiB
9177c9d4c2
Commit Graph

1786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Skia
efb70652af counter: redirect to counter main when barman login is timed out 2021-09-26 13:58:39 +02:00
Skia
05256bb99a counter: templates: click: JS clean up 2021-09-26 13:58:39 +02:00
Skia
64d0cc2fa8 counter: don't display info boxes and navigation menu 
This will lighten the pages and make the functionality directly
accessible without ever scrolling the header garbage that is never
needed on those pages.
 2021-09-26 13:58:39 +02:00
Skia
f5d7267ba7 Merge branch 'skia/fix_ci' into 'master' 
Fix CI

See merge request ae/Sith!277
 2021-07-21 13:16:02 +00:00
Skia
24c0a21cc1 locale: update with latest code version 2021-04-23 12:02:03 +02:00
Skia
6a352d642b accounting: fix tests with a computed date instead of hard-coded one 2021-04-23 12:02:03 +02:00
Sli
48ae1f7c1c Merge branch 'och' into 'master' 
Edited subscriptions

See merge request ae/Sith!275
 2020-09-01 00:21:48 +02:00
Francesco Witz
aaf1adaaa1 sith: Added a new subscription 2020-08-30 23:53:19 +02:00
Bartuccio Antoine
f34f5fe693
Upgrade black and format accordingly 2020-08-27 15:59:42 +02:00
Sli
f485178422 Merge branch 'och' into 'master' 
settings: Added a new subscription

See merge request ae/Sith!274
 2020-06-18 00:23:51 +02:00
Och
797ca0f926 settings: Added a new subscription 2020-06-18 00:23:51 +02:00
Sli
390a4b0064 Merge branch 'bugfix' into 'master' 
cache: fix error 500 with new django version

See merge request ae/Sith!273
 2020-06-16 19:11:49 +02:00
Bartuccio Antoine
94b029dc9c
cache: fix error 500 with new django version 2020-06-12 20:44:37 +02:00
Sli
45d5728c3e Merge branch 'skia/lazy_load_user_pictures' into 'master' 
core: add lazy loading in user pictures page

See merge request ae/Sith!272
 2020-06-12 20:19:34 +02:00
Skia
6eabbaf209 core: add lazy loading in user pictures page 2020-05-15 12:14:14 +02:00
Sli
03fdd0b947 Merge branch 'trombi' into 'master' 
trombi: raw tool for trombi admins to add a club membership to a trombi member

See merge request ae/Sith!266
 2020-03-23 21:12:58 +01:00
Bartuccio Antoine
fb8faacddc
trombi: raw tool for trombi admins to add a club membership to a trombi member 2020-03-22 16:14:37 +01:00
Sli
7ee4557ab5 Merge branch 'fix-webcam-error' into 'master' 
Front: turn Webcam.js error from an alert to a console log

See merge request ae/Sith!265
 2020-03-05 19:20:22 +01:00
tleb
5accdbccbb Front: use Webcam.on() for error handling 2020-03-04 07:13:16 +01:00
tleb
7fb26f9e45 Front: turn Webcam.js error from an alert to a console log 2020-03-03 09:01:20 +01:00
CHARMEAU
26a07f722d Remove gender option of matmatronche & update gender settings 2020-02-16 17:51:51 +01:00
Sli
9176a03a8a Merge branch 'bugfix' into 'master' 
Fix some SAS and forum errors

Closes #89

See merge request ae/Sith!263
 2019-12-17 12:03:28 +01:00
Bartuccio Antoine
4a1bfc366d
sas: fix 500 error when tagging the same user twice or adding a non existing user 2019-12-17 11:25:17 +01:00
Bartuccio Antoine
ebee8c34e1
forum: fix ForumTopicSubscribeView error 500 with anonymous user 2019-12-16 15:00:33 +01:00
Bartuccio Antoine
4ecad1c73b
Revert "PÈRE 200 !!!!!!!!!!! PÈRE 200 !!!!!!!! TRALALALALÈREEEEUUUU !!!!" 
This reverts commit d1b3a4d3f6.
 2019-12-10 15:31:37 +01:00
Bartuccio Antoine
d1b3a4d3f6
PÈRE 200 !!!!!!!!!!! PÈRE 200 !!!!!!!! TRALALALALÈREEEEUUUU !!!! 2019-12-09 03:16:57 +01:00
Sli
40832bb3bf Merge branch 'clubs' into 'master' 
Improve Sellings view for clubs

See merge request ae/Sith!262
 2019-11-29 16:32:18 +01:00
Bartuccio Antoine
4a78157f9a
club: fix typo on ClubSellingView 2019-11-28 15:14:51 +01:00
Bartuccio Antoine
bf5fc8750d
club: steam CSV download for SellingView 2019-11-28 14:52:33 +01:00
Bartuccio Antoine
274a7b7137
core/club: allow adding custom js action to pagination link, useful for FormDetailView with pagination 2019-11-28 01:46:41 +01:00
Bartuccio Antoine
8dd2c02d3e
club: add pagination for ClubSellingView 2019-11-28 00:30:51 +01:00
Bartuccio Antoine
a73f5cb270
club: use sums in bdd for ClubSellingView 2019-11-27 21:37:59 +01:00
Bartuccio Antoine
7d40e11144
club: ClubSellingView way faster and with multiple selections everywhere 2019-11-27 20:59:32 +01:00
Bartuccio Antoine
af48553e35
club: separation between archived products and non archived ones 2019-11-27 16:23:14 +01:00
Sli
ad8bcc7282 Merge branch 'bugfix' into 'master' 
com: fix 500 error when utbm mail server refuse weekmail

See merge request ae/Sith!260
 2019-11-25 14:18:22 +01:00
Sli
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
Bartuccio Antoine
6a153719f9
com: fix 500 error when utbm mail server refuse weekmail 2019-11-25 13:30:47 +01:00
Bartuccio Antoine
5c8fa1b9e7
core: add UserIsRootMixin and an admin delete view for memberships 2019-11-24 19:23:43 +01:00
Sli
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
Sli
9cb432a082 doc: correct documentation for groups 2019-11-21 11:11:25 +01:00
Sli
869d29d4a4 doc: corrections for populate documentation 2019-11-21 11:10:31 +01:00
Bartuccio Antoine
c3d2e64a43
doc: add infos on populate command with group and users available 2019-11-20 18:51:13 +01:00
Bartuccio Antoine
e1770ec52c
doc: add documentation for groups 2019-11-20 17:55:00 +01:00
Bartuccio Antoine
1256744f1b
documentation: add autoreload and build for documentation server 2019-11-20 17:03:18 +01:00
Bartuccio Antoine
77dddbc581
documentation: add help ressources and update installation instructions 2019-11-20 17:03:18 +01:00
Sli
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
Sli
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
Bartuccio Antoine
5c30de5f22
core: redesign request middleware with django latest design and better use of threading 2019-11-14 16:32:29 +01:00
Bartuccio Antoine
1c03ce621f
core: remove default value for OperationLog 2019-11-14 16:11:20 +01:00
Bartuccio Antoine
e634cda318
core/counter: add generic operation logs and implements it for Sellings and Refilling deletions 2019-11-14 01:14:44 +01:00