1085 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Gabriel Detraz	56421133cb	mme si c'est optionnel, l'argument ne l'est pas	2016-12-27 17:56:22 +00:00
Gabriel Detraz	6814ab6adc	Add optionnal apps in settings (ex django_extensions)	2016-12-27 17:48:56 +00:00
Gabriel Detraz	3444084b01	Add optionnal apps in settings (ex django_extensions)	2016-12-27 18:42:17 +01:00
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	db3d9cb468	Fix bug	2016-12-26 19:45:51 +01:00
Gabriel Detraz	d6b488deac	fix mac-ip-dns	2016-12-26 18:01:01 +01:00
Gabriel Detraz	0706021fa2	Change ns path	2016-12-26 17:44:04 +01:00
chirac	badbcdb5a5	fix serializers	2016-12-26 00:01:48 +01:00
chirac	2b07beea85	Bricoles 2	2016-12-24 20:32:36 +01:00
chirac	a87f5e6605	Bricoles	2016-12-24 20:20:25 +01:00
chirac	5c04088a0a	Phase 2 modification domain	2016-12-24 20:04:53 +01:00
chirac	4379a4fcc5	Creation de domain, transfert	2016-12-24 18:07:09 +01: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	cda4548981	Code dupliqué, simplifie + django 1.10	2016-12-18 22:26:33 +00:00
Gabriel Detraz	d264280ee3	Code dupliqué, simplifie + django 1.10	2016-12-18 22:25:47 +00:00
Gabriel Detraz	492825c511	No crash à la migration initiale	2016-12-18 09:53:16 +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	4cbd0cc7dc	Oublie d'un __in	2016-12-14 19:07:46 +01:00
Gabriel Detraz	e1844a5ab6	Supprime les machines orphelines	2016-12-14 18:14:57 +01:00
root	4cd32edf1a	Merge branch 'master' of https://gitlab.rezometz.org/rezo/re2o	2016-12-14 18:11:53 +01:00
Gabriel Detraz	e8e93ed4be	Supprime les machines orphelines	2016-12-14 18:10:14 +01:00
Gabriel Detraz	eb9937a370	Oubli d'un render_to_response	2016-12-14 03:54:02 +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
root	fc7f1ddb7f	Revert "Depreciation de namespace dans django 1.9" ... This reverts commit 2febf5b246.	2016-12-14 03:34:43 +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