Marius Burkard
2016-01-29 f611abe17c1db9d736bbfb6b12b4711c70e9e365
refs
author Marius Burkard <m.burkard@pixcept.de>
Friday, January 29, 2016 10:25 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Friday, January 29, 2016 10:25 -0500
commitf611abe17c1db9d736bbfb6b12b4711c70e9e365
tree 7acb45f8b36d77e71e669b774f2e120db2b5535c tree | zip | gz
parent 613433fd4eed8f566e9f8f0be4b6116fe028f123 view | diff
b8f4caccb73052b9d7488b592ed4854958a4dc76 view | diff
Merge branch 'stable-3.1'
17 files added
15 files modified
1342 ■■■■■ changed files
TODO.txt 4 ●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 25 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_dev_collection.sql 10 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 6 ●●●● diff | view | raw | blame | history
install/tpl/named.conf.options.master 28 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_ds_edit.php 53 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_loc_edit.php 53 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_tlsa_edit.php 161 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_ds.tform.php 166 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_loc.tform.php 171 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_soa.tform.php 14 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_tlsa.tform.php 158 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_ds.lng 17 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_loc.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_soa.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_spf.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_tlsa.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_ds.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_loc.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_soa.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_spf.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_tlsa.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/remote.conf.php 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/list/dns_a.list.php 2 ●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_a_list.htm 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_ds_edit.htm 32 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_loc_edit.htm 32 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_soa_edit.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_tlsa_edit.htm 32 ●●●●● diff | view | raw | blame | history
server/conf/bind_pri.domain.master 9 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/550-bind_dnssec.inc.php 89 ●●●●● diff | view | raw | blame | history
server/plugins-available/bind_plugin.inc.php 170 ●●●●● diff | view | raw | blame | history