1718 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Bartuccio Antoine	3501703c15	eboutic: don't display future account balance if contains refilling item	2019-11-05 19:50:08 +01:00
Sli	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
Bartuccio Antoine	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
Sli	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
Sli	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
Sli	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