gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Merge branch 'dnssec-dnswizard' into 'stable-3.1'

Till Brehm

2016-04-07 b203f3ee3774b6335e70f105172eba688fec28bb

refs
author	Till Brehm <tbrehm@ispconfig.org>
	Thursday, April 7, 2016 05:58 -0400
committer	Till Brehm <tbrehm@ispconfig.org>
	Thursday, April 7, 2016 05:58 -0400
commit	b203f3ee3774b6335e70f105172eba688fec28bb
tree	1ef6d6b754d81eff125ce4d8cfcaedf0e0ed0ed7 tree \| zip \| gz
parent	6a85386aa4a1fd2072341546f4b07937cdbd94e5 view \| diff 28cd07d1a75c4e9dcaecac49efee0091f2fc62fa view \| diff

Merge branch 'dnssec-dnswizard' into 'stable-3.1'

Implemented a checkbox "enable DNSSEC" in DNS-Wizard

This Checkbox can be enabled or disabled by template.

Further I fixed an inconsistent design (HTML) which was introduced by @tbrehm yesterday I tink. (DKIM-Checkbox)

As everytime I only edited german and english language

See merge request !309

5 files modified

	install/sql/incremental/upd_dev_collection.sql	2 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_wizard.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_template.tform.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/templates/dns_wizard.htm	12 ●●●●● diff \| view \| raw \| blame \| history