3209 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gabriel Detraz	4a1d0a1026	Lerennais remarques	2020-04-23 03:29:11 +02:00
Gabriel Detraz	38b119bb8e	Add comment to tikets + send_notif mails	2020-04-23 03:18:34 +02:00
Gabriel Detraz	c8c89fab1d	Fix and harmonize some issues in ticket app	2020-04-23 03:18:34 +02:00
Hugo Levy-Falk	acf510a8e7	No need for preferences/utils	2020-04-23 03:18:16 +02:00
Gabriel Detraz	cd46e77a03	New place for local preferences	2020-04-23 03:18:16 +02:00
Gabriel Detraz	9ea8808f75	New organisation for local apps and all settings in folder preferences	2020-04-23 03:18:16 +02:00
Gabriel Detraz	b4edd7f4dc	Create preferences models and edition template	2020-04-23 03:17:58 +02:00
klafyvel	623df4a9c3	Merge branch 'machine_history' into 'dev' ... Add machine history view See merge request re2o/re2o!513	2020-04-22 23:30:26 +02:00
Jean-Romain Garnier	17f0691957	Fix comments for machine history view and model	2020-04-22 23:25:19 +02:00
Jean-Romain Garnier	5639d43866	Remove unused file	2020-04-22 23:25:19 +02:00
Jean-Romain Garnier	a5b67300c9	Fix number of results in pagination for machine history	2020-04-22 23:25:19 +02:00
Jean-Romain Garnier	01236373aa	Add pagination for machine history results	2020-04-22 23:25:19 +02:00
Jean-Romain Garnier	91cee11297	Add missing translations in logs	2020-04-22 23:25:19 +02:00
Jean-Romain Garnier	41723adc89	Fix date check in machine history display	2020-04-22 23:25:19 +02:00
Jean-Romain Garnier	69666e1c91	Handle dates more gracefuly in machine history view	2020-04-22 23:25:19 +02:00
Jean-Romain Garnier	6678c15c2c	Fix date compare in machine history view	2020-04-22 23:25:19 +02:00
Jean-Romain Garnier	830f6341df	Add link to machine history view	2020-04-22 23:25:19 +02:00
Jean-Romain Garnier	e76a215579	Handle empty dates in machine history results view	2020-04-22 23:25:18 +02:00
Jean-Romain Garnier	f051d5c09c	Tweak machine history results view	2020-04-22 23:25:18 +02:00
Jean-Romain Garnier	c662fa64d8	Improve machine history results view	2020-04-22 23:25:18 +02:00
Jean-Romain Garnier	451923be3e	Add comments to logs/models.py	2020-04-22 23:25:18 +02:00
Jean-Romain Garnier	c4634191f5	Fix machine history views	2020-04-22 23:25:18 +02:00
Jean-Romain Garnier	4b7393b5e4	Add views to get IP / MAC history	2020-04-22 23:25:18 +02:00
chirac	ff3def9d82	Merge branch 'cgu_line_formatting' into 'dev' ... Fix CGU multiline formatting See merge request re2o/re2o!514	2020-04-22 21:40:10 +02:00
Jean-Romain Garnier	3fdcdd99b2	Fix CGU line formatting	2020-04-22 19:34:55 +00:00
klafyvel	469e273efb	Merge branch 'session_cookie_secure' into 'dev' ... Explain SESSION_COOKIE_AGE in settings_local.example.py See merge request re2o/re2o!511	2020-04-22 12:33:51 +02:00
Jean-Romain Garnier	5c56abcbd5	Comment SESSION_COOKIE_AGE setting	2020-04-22 12:30:06 +02:00
Jean-Romain Garnier	17fbaab502	Merge branch 'fix_132' into 'dev' ... Fix #132, return in clean if ip domaine are invalid See merge request re2o/re2o!509	2020-04-21 22:59:26 +02:00
Gabriel Detraz	badf29d26f	Fix #132, return in clean if ip domaine are invalid	2020-04-21 22:54:52 +02:00
chirac	ab541ab503	Merge branch 'handle_empty_emails' into 'dev' ... Handle empty emails See merge request re2o/re2o!508	2020-04-21 21:52:45 +02:00
Jean-Romain Garnier	5107a34a6e	Add missing translations	2020-04-21 19:48:59 +00:00
Jean-Romain Garnier	91a4c35d3b	Improve comments for User clean methods	2020-04-21 21:38:31 +02:00
Gabriel Detraz	e47b555343	Check email in user clean (factorise code)	2020-04-21 19:27:12 +02:00
Jean-Romain Garnier	24abff4106	Fix some email checks being bypassed for legacy users	2020-04-21 19:22:14 +02:00
Jean-Romain Garnier	b119bfeb65	Prevent user email from being null	2020-04-21 19:22:14 +02:00
Jean-Romain Garnier	eb4dd7ebe3	Make email check more pythonic	2020-04-21 19:22:14 +02:00
Jean-Romain Garnier	51b3c52181	Leave user email blank / null for compatilibity	2020-04-21 19:22:14 +02:00
Jean-Romain Garnier	ba05a682f4	Handle empty emails	2020-04-21 19:22:13 +02:00
Jean-Romain Garnier	99cd24cec0	Add required for email field when necessary	2020-04-21 19:21:43 +02:00
Jean-Romain Garnier	42c15c1f5d	Leave user email blank / null for compatilibity	2020-04-21 19:21:43 +02:00
Jean-Romain Garnier	f875e317ef	Handle empty emails	2020-04-21 19:21:43 +02:00
chirac	e94b619116	Merge branch 'fix-98-new-edit-listright' into 'dev' ... Fix #98 See merge request re2o/re2o!507	2020-04-21 19:09:14 +02:00
Hugo Levy-Falk	5df604e792	Fix dead code.	2020-04-21 18:17:47 +02:00
Hugo Levy-Falk	0dd0c614a4	Merge branch 'fix-98-new-edit-listright' of https://gitlab.federez.net/re2o/re2o into fix-98-new-edit-listright	2020-04-21 18:09:40 +02:00
Hugo Levy-Falk	90dc125355	Production version of VueJS	2020-04-21 18:08:18 +02:00
Hugo Levy-Falk	da0b820006	Fix #98	2020-04-21 18:03:03 +02:00
chirac	f390fca561	Merge branch 'split_api' into 'dev' ... Split api See merge request re2o/re2o!505	2020-04-21 18:02:06 +02:00
Gabriel Detraz	c02938b133	Remove useless imports	2020-04-21 17:48:42 +02:00
Hugo Levy-Falk	a3b352b29d	Fix #98	2020-04-21 17:37:17 +02:00
chapeau	72984c12e3	Fix of copy/paste errors	2020-04-21 17:19:16 +02:00