3199 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Laouen Fernet	9b39529fd2	Fix some translations in tickets/	2020-06-01 18:21:21 +02:00
Laouen Fernet	dbf7485107	Fix some translations in preferences/	2020-06-01 18:21:21 +02:00
Laouen Fernet	806a6a562e	Fix some translations in logs/	2020-06-01 18:21:21 +02:00
Laouen Fernet	99a3f7e9c5	Fix some translations in cotisations/	2020-06-01 18:21:21 +02:00
Gabriel Detraz	e1f8254115	Translation of docstrings in user admin and forms	2020-06-01 18:21:21 +02:00
Laouen Fernet	fb9ae20f37	Add or translate some docstrings in machines/	2020-06-01 18:21:21 +02:00
Laouen Fernet	3b697f9795	Add or translate some docstrings in topologie/	2020-06-01 18:21:21 +02:00
Laouen Fernet	a4c3f77500	Add or translate some docstrings in preferences/	2020-06-01 18:21:20 +02:00
Laouen Fernet	3ec05c68e5	Add some docstrings in search/	2020-06-01 18:21:20 +02:00
Laouen Fernet	e52705edc3	Add some docstrings in multi_op/	2020-06-01 18:21:20 +02:00
Laouen Fernet	b66a9230a0	Add some docstrings in tickets/	2020-06-01 18:21:20 +02:00
Laouen Fernet	9f16601860	Add or translate some docstrings in logs/	2020-06-01 18:21:20 +02:00
Gabriel Detraz	9fa2879d88	First step of docstring translation	2020-06-01 18:21:19 +02:00
chirac	023986f77e	Merge branch 'fix-machine-display-name' into 'dev' ... Let's have a useful displayed name for machines. See merge request re2o/re2o!539	2020-06-01 14:00:50 +02:00
Hugo Levy-Falk	9f568d4fb9	Let's have a useful displayed name for machines.	2020-06-01 11:24:23 +02:00
chirac	98b2e132cc	Merge branch 'feature-view-button' into 'dev' ... I need a view button See merge request re2o/re2o!538	2020-05-30 18:34:33 +02:00
Hugo Levy-Falk	e1542b9e92	I need a view button	2020-05-30 18:14:33 +02:00
klafyvel	c3227b52de	Merge branch 'fix_268' into 'dev' ... Fix 268 See merge request re2o/re2o!537	2020-05-29 20:10:38 +02:00
Gabriel Detraz	ee0fe7b24e	Refactor serviceuser admin	2020-05-28 22:27:37 +02:00
Gabriel Detraz	eb5becb0db	Fix user adherent/club creation form	2020-05-28 22:08:44 +02:00
chirac	a5dda65412	Update year in base.html	2020-05-28 14:49:29 +02:00
chirac	2a12f168ae	Merge branch 'fix_routers' into 'dev' ... Update CHANGELOG.md See merge request re2o/re2o!536	2020-05-21 18:47:56 +02:00
chirac	7f82878c69	Update CHANGELOG.md	2020-05-21 18:47:17 +02:00
klafyvel	9c01bf7a12	Merge branch 'fix_routers' into 'dev' ... Fix, add a possible local_routers.py file for routers database use See merge request re2o/re2o!535	2020-05-21 18:41:47 +02:00
Gabriel Detraz	48b084e047	Fix, add a possible local_routers.py file for routers database use	2020-05-21 18:34:42 +02:00
klafyvel	804101a9da	Merge branch 'add-thumbnail-to-user-model' into 'dev' ... Fix small issue with image displayed See merge request re2o/re2o!534	2020-05-21 18:20:52 +02:00
Leila	ba917fe644	Fix small image bug	2020-05-21 18:10:30 +02:00
klafyvel	abc2748c56	Merge branch 'add-thumbnail-to-user-model' into 'dev' ... Add thumbnail to user model See merge request re2o/re2o!533	2020-05-19 16:30:33 +02:00
chiahetcho	1ba03335e4	Correct django settings	2020-05-18 16:52:53 +02:00
Leila	a6e324bc60	Add migration file	2020-05-18 16:49:17 +02:00
Leila	c4fcf68077	Update image in filesystem when user changes image	2020-05-17 18:01:22 +02:00
Leila	d94f7b44a3	Add thumbnail to user model	2020-05-17 12:51:05 +02:00
chirac	2466792f92	Merge branch 'fix_backports_flag' into 'dev' ... Update : Fix pip/pip3 + flag buster freeradius package See merge request re2o/re2o!532	2020-05-16 17:17:14 +02:00
chirac	55f1b98c94	Update apt_requirements_radius.txt	2020-05-16 17:06:07 +02:00
Gabriel Detraz	80d5010d3c	Update : Fix pip/pip3 + flag buster freeradius package	2020-05-16 16:42:56 +02:00
klafyvel	898c0f2472	Merge branch 'python2.7_fix' into 'dev' ... Retro-compat for python2.7 radius instance See merge request re2o/re2o!530	2020-05-16 13:55:10 +02:00
Gabriel Detraz	610e8815d0	Retro-compat for python2.7 radius instance	2020-05-16 13:49:23 +02:00
klafyvel	bc7dcfd061	Merge branch 'freeradius_python3' into 'dev' ... Freeradius python3 backend See merge request re2o/re2o!531	2020-05-16 13:47:32 +02:00
klafyvel	ab5e7f5bdd	Grammar nazi mode : on.	2020-05-16 12:56:09 +02:00
klafyvel	aa0532206b	@chirac needs some sleep.	2020-05-16 12:54:36 +02:00
chirac	40c164bed9	Update CHANGELOG.md	2020-05-16 04:14:31 +02:00
Gabriel Detraz	0a60f67816	Freeradius python3 backend	2020-05-16 03:57:51 +02:00
jr-garnier	46e3c26d80	Merge branch 'rename_rezo_rez_uid' into 'dev' ... Rename rezo_rez_uid legacy and add some help text entries See merge request re2o/re2o!529	2020-05-03 16:05:45 +02:00
Gabriel Detraz	e82b170698	Rename rezo_rez_uid legacy and add some help text entries	2020-05-03 15:59:59 +02:00
jr-garnier	65b624df58	Merge branch 'fix_ticket_name' into 'dev' ... Fix name format for tickets See merge request re2o/re2o!528	2020-05-03 12:53:40 +02:00
Gabriel Detraz	52cfdc7105	Fix name format for tickets	2020-05-03 02:12:04 +02:00
chirac	8e4cb69025	Merge branch 'wrong_history_data' into 'dev' ... Fix wrong data being sometimes shown in history See merge request re2o/re2o!527	2020-05-03 01:51:09 +02:00
Jean-Romain Garnier	0c21a8e14d	Fix mac address filter no longer working	2020-05-03 00:47:49 +02:00
Jean-Romain Garnier	d330ddde87	Fix error in format string	2020-05-03 00:39:45 +02:00
Jean-Romain Garnier	524403de2b	Fix filtering error when showing history	2020-05-03 00:27:49 +02:00