2734 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Charlie Jacomme	b24ef60d6a	Preferences renamed in administration	2018-08-12 18:30:54 +02:00
Charlie Jacomme	018dae90fa	update of footer and contributor text	2018-08-12 18:30:54 +02:00
Charlie Jacomme	2d41c8ba0b	update contributors	2018-08-12 18:30:54 +02:00
grisel-davy	c16f635c48	frontend sur le profil	2018-08-12 18:30:54 +02:00
Charlie Jacomme	bb67127c3d	media_url bug fix	2018-08-12 18:30:54 +02:00
Charlie Jacomme	51bfb5d6ce	Aff_article template bug fix	2018-08-12 18:30:54 +02:00
grisel-davy	93f4983fb9	Suppresion du cache qui permetait de voir d'autres user	2018-08-12 18:30:54 +02:00
grisel-davy	5f4affd8ec	Vu profil d'un autre user et solde correct	2018-08-12 18:30:54 +02:00
grisel-davy	8aefc37eca	change couleur des panel heading en accordeon pour une meilleur comprehension	2018-08-12 18:30:54 +02:00
chirac	ee53be34ec	Merge branch 'python2_radius' into 'dev' ... Python2 radius See merge request federez/re2o!250	2018-08-12 18:30:33 +02:00
Gabriel Le Bouder	0409031c40	removing spurius comment line	2018-08-12 18:24:48 +02:00
Charlie Jacomme	df5861424e	radius, make python compatible, and add traceback	2018-08-12 18:24:48 +02:00
chirac	433a85f6c8	Merge branch 'python2_templatetag' into 'dev' ... templatetags python2 complient See merge request federez/re2o!248	2018-08-12 18:22:54 +02:00
Gabriel Le Bouder	e797eb89b2	templatetags python2 complient	2018-08-12 18:19:21 +02:00
chirac	6b484da4d3	Merge branch 'translate_global_msg' into 'dev' ... Allows to display a French or English general message based on user's language choice. See merge request federez/re2o!252	2018-08-12 18:13:00 +02:00
chirac	ed1a013c3f	Rename instead of delete	2018-08-12 18:09:30 +02:00
Maxime Bombar	cd13c5240a	Allows to display a French or English general message based on user's language choice.	2018-08-12 17:59:18 +02:00
chirac	e0f82c7d6d	Merge branch 'python2_headers' into 'dev' ... Headers python2 See merge request federez/re2o!242	2018-08-09 11:18:56 +02:00
Gabriel Detraz	c6db3283ee	Headers python2	2018-08-09 11:15:57 +02:00
chirac	1529d07b48	Merge branch 'fix_ldap_searc' into 'dev' ... Update schema.ldiff, limit de recherche à 50000 See merge request federez/re2o!241	2018-08-09 11:06:00 +02:00
chirac	e270a738f2	Update schema.ldiff, limit de recherche à 50000	2018-08-09 11:04:47 +02:00
chirac	58c7b64de1	Merge branch 'get_mail_func' into 'dev' ... Fix bug evaluation des emailaddress + func get_mail sur user See merge request federez/re2o!240	2018-08-09 00:25:17 +02:00
Gabriel Detraz	50265a5c4b	Fix bug evaluation des emailaddress + func get_mail sur user	2018-08-09 00:23:29 +02:00
chirac	ddce1892b7	Merge branch 'fix_firewall_synth' into 'dev' ... FIx la synthaxe correcte pour iptables See merge request federez/re2o!239	2018-08-09 00:04:50 +02:00
Gabriel Detraz	d3033e8f48	FIx la synthaxe correcte pour iptables	2018-08-09 00:03:44 +02:00
chirac	5723d39af0	Merge branch 'fix_cnames' into 'dev' ... Fix cnames See merge request federez/re2o!238	2018-08-08 23:57:39 +02:00
Charlie Jacomme	bb12346132	Fix cnames	2018-08-08 12:07:31 +02:00
chirac	ad1ce4ed08	Merge branch 'api_mail_aliases' into 'dev' ... add info for mail aliases export See merge request federez/re2o!237	2018-08-08 11:58:04 +02:00
Charlie Jacomme	1c8fb84f3c	add info for mail aliases export	2018-08-08 11:57:22 +02:00
chirac	8e85dc1699	Merge branch 'mx_not_unique' into 'dev' ... mx not uniques, same mx for several extensions See merge request federez/re2o!233	2018-08-07 18:02:49 +02:00
Charlie Jacomme	96480ae588	mx not uniques, same mx for several extensions	2018-08-07 18:02:34 +02:00
chirac	a3ebf34601	Merge branch 'typos_and_fix_radius' into 'dev' ... Fix des erreurs, et améliore la lisibilité des logs See merge request federez/re2o!236	2018-08-07 18:01:17 +02:00
Gabriel Detraz	ef2101e0c5	Fix des erreurs, et améliore la lisibilité des logs	2018-08-07 17:22:58 +02:00
chirac	2b4680b54d	Merge branch 'reverse_dns_zones' into 'dev' ... Reverse dns zones See merge request federez/re2o!232	2018-08-07 11:09:44 +02:00
Charlie Jacomme	b89823faa1	we want full ndd for ns and mx	2018-08-07 10:30:23 +02:00
Charlie Jacomme	b9a4dd6d65	ptr are empty if revere disabled	2018-08-07 09:57:59 +02:00
Charlie Jacomme	cee0d1188e	rename booleans dnssec_reverse_* to reverse_*	2018-08-07 09:52:00 +02:00
Charlie Jacomme	e86a0ff58b	add prefix_v6_length serializer	2018-08-07 09:24:21 +02:00
chirac	49646ae34b	Merge branch 'domaine_network' into 'dev' ... Domaine network See merge request federez/re2o!229	2018-08-07 00:36:05 +02:00
chirac	52685c02ed	Merge branch 'python2_header' into 'dev' ... Python2 header See merge request federez/re2o!227	2018-08-07 00:29:51 +02:00
chirac	d4a90d1faf	Merge branch 'non_uniq_ipv6' into 'dev' ... L'ipv6 n'est pas unique au niveau bdd pour if serveurs multiples See merge request federez/re2o!228	2018-08-07 00:23:54 +02:00
chirac	93ece1ff6a	Merge branch 'bug_ipv6_list' into 'dev' ... Fix object interface fonction index ipv6 See merge request federez/re2o!226	2018-08-07 00:13:43 +02:00
Gabriel Detraz	34fe6e06b7	Specification optionnelle du range contenant domain ipstart-stop	2018-08-07 00:11:20 +02:00
Gabriel Detraz	efbd0a18da	L'ipv6 n'est pas unique au niveau bdd pour if serveurs multiples	2018-08-07 00:09:30 +02:00
Gabriel Detraz	57b4d8ff74	Header pour execution en python2	2018-08-07 00:05:35 +02:00
Gabriel Detraz	e9c0920a42	Fix object interface fonction index ipv6	2018-08-07 00:02:53 +02:00
chirac	6ddf9d48d1	Merge branch 'hotfix-mail-field-in-user-forms' into 'dev' ... Mail->email, hotfix See merge request federez/re2o!225	2018-08-05 23:05:14 +02:00
detraz	28b78965f6	Mail->email, hotfix	2018-08-05 23:01:42 +02:00
chirac	7b73f5a63b	Merge branch 'hotfix-mail-field-in-user-forms' into 'dev' ... Remet le field email dans UserForm et AdherentForm See merge request federez/re2o!219	2018-08-05 22:57:24 +02:00
chirac	ee615ae1e1	Merge branch 'firewall_export' into 'dev' ... Firewall export See merge request federez/re2o!224	2018-08-05 21:07:12 +02:00