317 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mael Kervella	28aa8ccc1d	Merge branch 'stretch' of https://gitlab.rezometz.org/rezo/re2o into stretch	2016-12-27 13:49:16 +00:00
Mael Kervella	a3adf44ea1	Stretch fix ... Correction de la génération des PDF	2016-12-27 13:47:12 +00:00
Gabriel Detraz	ad853470c0	Stretch fix	2016-12-26 23:49:07 +00:00
Gabriel Detraz	0c7c48f0fb	Fix bug	2016-12-26 19:24:45 +00:00
Gabriel Detraz	ef0042b0d6	fix mac-ip-dns	2016-12-26 19:24:36 +00:00
Gabriel Detraz	4e830d5619	Change ns path	2016-12-26 19:24:28 +00:00
chirac	f5bfc5c4c2	fix serializers	2016-12-26 19:11:19 +00:00
chirac	4e0ee40ecf	Bricoles 2	2016-12-26 19:10:38 +00:00
chirac	d0a33cbb22	Bricoles	2016-12-26 19:10:17 +00:00
chirac	b56cbe6a17	Phase 2 modification domain	2016-12-26 19:10:03 +00:00
chirac	adf88afa2b	Creation de domain, transfert	2016-12-26 19:05:25 +00:00
Gabriel Detraz	1a61f7a11b	Serializer django 1.10	2016-12-19 23:01:41 +00:00
Mael Kervella	ca14749a35	Fix django 1.10 code incorrect	2016-12-19 19:56:10 +00:00
Gabriel Detraz	d264280ee3	Code dupliqué, simplifie + django 1.10	2016-12-18 22:25:47 +00:00
Gabriel Detraz	20f141686b	No crash à la migration initiale	2016-12-18 09:52:47 +00:00
Gabriel Detraz	3d41b71b01	Oublie d'un __in	2016-12-14 19:08:15 +01:00
Gabriel Detraz	e1844a5ab6	Supprime les machines orphelines	2016-12-14 18:14:57 +01:00
Gabriel Detraz	e95d3ec8c5	Oubli d'un render_to_response	2016-12-14 03:53:16 +01:00
Gabriel Detraz	945ff8be77	Change le comportement de /login/ dans django 1.10, fix redirect url	2016-12-14 03:49:26 +01:00
root	0a932a1cbf	Revert "Revert "Fix static css loading issue"" ... This reverts commit 93ff47d0e9.	2016-12-14 03:35:34 +01:00
Gabriel Detraz	2febf5b246	Depreciation de namespace dans django 1.9	2016-12-14 03:32:51 +01:00
Gabriel Detraz	a5b69d35a6	bugfix, in django 1.10 l'extension n'est plus implicite	2016-12-14 03:20:17 +01:00
root	ca68aa0218	Merge branch 'master' of https://gitlab.rezometz.org/rezo/re2o	2016-12-14 03:09:42 +01:00
Gabriel Detraz	19d984f85e	A partir de django 1.9 les filter__in ne sont plus implicites	2016-12-14 03:09:22 +01:00
root	93ff47d0e9	Revert "Fix static css loading issue" ... This reverts commit 90df520620.	2016-12-13 16:46:32 +01:00
lhark	90df520620	Fix static css loading issue	2016-12-13 00:18:33 +01:00
chirac	16348305f6	Update settings_local	2016-12-12 16:59:33 +01:00
Gabriel Detraz	e55d3a9e70	Reactive ldap sync	2016-12-12 15:59:16 +01:00
Gabriel Detraz	9b142b3064	Modifications pour compatibilité avec stretch 1	2016-12-12 13:32:57 +01:00
root	d61498800b	Merge branch 'master' of https://gitlab.rezometz.org/rezo/re2o	2016-12-11 17:24:53 +01:00
root	bdd6d29fd3	Fix pour reversion 2	2016-12-11 17:24:04 +01:00
Gabriel Detraz	e266a85462	Corrige auth.py pour la partie authorize filaire et user	2016-12-11 01:29:45 +01:00
Gabriel Detraz	8b0114391a	Add auth.py et module	2016-12-08 15:14:06 +01:00
Gabriel Detraz	89729f9a6b	Script d'auth freeradius	2016-12-08 06:17:33 +01:00
Gabriel Detraz	a3d8b88ae6	Correction mineur	2016-12-08 06:16:08 +01:00
Gabriel Detraz	f59930e48d	Add radius settings	2016-12-08 05:43:33 +01:00
Simon Brélivet	414c796416	Ajoute le submodule pyomapi	2016-12-06 18:14:26 +01:00
Simon Brélivet	df2f05f5ff	Merge branch 'master' of https://gitlab.rezometz.org/rezo/re2o	2016-12-04 17:07:19 +01:00
Simon Brélivet	ca0610fb54	aaa	2016-12-04 17:07:06 +01:00
Dalahro	8e0c5daab3	Un charactère	2016-12-04 17:04:23 +01:00
Éloi Alain	944988a496	Mail de bienvenue en HTML	2016-12-04 16:51:55 +01:00
Simon Brélivet	666aeaef48	Merge branch 'master' of https://gitlab.rezometz.org/rezo/re2o	2016-12-04 16:05:18 +01:00
Gabriel Detraz	14cf26983a	Ajout du mail de bienvenue	2016-12-04 16:04:49 +01:00
Éloi Alain	d6411168c2	Ajout du mail de bienvenue	2016-12-04 00:12:50 +01:00
Éloi Alain	bd1706a3fd	Sécurisation du site (manage.py check --deploy)	2016-12-04 00:06:42 +01:00
chirac	e5eb84882d	Merge branch 'master' of https://gitlab.rezometz.org/rezo/re2o	2016-12-01 03:14:46 +01:00
Gabriel Detraz	ea20cede0c	Rajoute une acl need_infra sur l'object ip	2016-12-01 03:02:02 +01:00
Gabriel Detraz	32217118e1	Bricoles, affiche les ip dispo	2016-11-30 04:49:13 +01:00
Gabriel Detraz	d5c5134d47	Fix models import	2016-11-30 00:59:26 +01:00
Simon Brélivet	50b8420dd4	Modification de create_cotis	2016-11-29 23:53:02 +01:00