ISPConfig3 devel
parent: 1b0146 | patch | commitdiff
Florian Schaal
2016-01-29 52e1a9879d14fb6309684cfdf564154eb0b8a387
refs
author Florian Schaal <florian@schaal-24.de>
Friday, January 29, 2016 12:16 -0500
committer Florian Schaal <florian@schaal-24.de>
Friday, January 29, 2016 12:16 -0500
commit52e1a9879d14fb6309684cfdf564154eb0b8a387
tree 31f0974529a81b2f85543fab8f65c026b08c8b98 tree | zip | gz
parent 1b0146ed7f5c66ab1f40863c0024a87a51cf421a view | diff
f611abe17c1db9d736bbfb6b12b4711c70e9e365 view | diff 
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
17 files added
19 files modified
1383 ■■■■■ changed files
TODO.txt 11 ●●●●● 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/lib/classes/tform_base.inc.php 23 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 2 ●●●●● 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
server/plugins-available/mongo_clientdb_plugin.inc.php 7 ●●●●● diff | view | raw | blame | history