Merge remote-tracking branch 'ispc/master' into new-layout-3.1
Conflicts: interface/web/dns/templates/dns_dkim_edit.htm interface/web/sites/templates/aps_instances_list.htm
Showing
- interface/lib/classes/aps_guicontroller.inc.php 104 additions, 116 deletionsinterface/lib/classes/aps_guicontroller.inc.php
- interface/lib/classes/remote.d/aps.inc.php 318 additions, 0 deletionsinterface/lib/classes/remote.d/aps.inc.php
- interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php 0 additions, 2 deletionsinterface/lib/plugins/sites_web_vhost_domain_plugin.inc.php
- interface/web/admin/form/server_config.tform.php 2 additions, 2 deletionsinterface/web/admin/form/server_config.tform.php
- interface/web/dns/dns_dkim_edit.php 20 additions, 13 deletionsinterface/web/dns/dns_dkim_edit.php
- interface/web/dns/dns_dkim_get.php 0 additions, 86 deletionsinterface/web/dns/dns_dkim_get.php
- interface/web/dns/dns_dmarc_edit.php 377 additions, 0 deletionsinterface/web/dns/dns_dmarc_edit.php
- interface/web/dns/dns_spf_edit.php 269 additions, 0 deletionsinterface/web/dns/dns_spf_edit.php
- interface/web/dns/form/dns_dmarc.tform.php 164 additions, 0 deletionsinterface/web/dns/form/dns_dmarc.tform.php
- interface/web/dns/form/dns_spf.tform.php 164 additions, 0 deletionsinterface/web/dns/form/dns_spf.tform.php
- interface/web/dns/form/dns_txt.tform.php 19 additions, 12 deletionsinterface/web/dns/form/dns_txt.tform.php
- interface/web/dns/lib/lang/ar_dns_dmarc.lng 50 additions, 0 deletionsinterface/web/dns/lib/lang/ar_dns_dmarc.lng
- interface/web/dns/lib/lang/ar_dns_spf.lng 25 additions, 0 deletionsinterface/web/dns/lib/lang/ar_dns_spf.lng
- interface/web/dns/lib/lang/ar_dns_txt.lng 16 additions, 13 deletionsinterface/web/dns/lib/lang/ar_dns_txt.lng
- interface/web/dns/lib/lang/bg_dns_dmarc.lng 50 additions, 0 deletionsinterface/web/dns/lib/lang/bg_dns_dmarc.lng
- interface/web/dns/lib/lang/bg_dns_spf.lng 25 additions, 0 deletionsinterface/web/dns/lib/lang/bg_dns_spf.lng
- interface/web/dns/lib/lang/bg_dns_txt.lng 3 additions, 0 deletionsinterface/web/dns/lib/lang/bg_dns_txt.lng
- interface/web/dns/lib/lang/br_dns_dmarc.lng 50 additions, 0 deletionsinterface/web/dns/lib/lang/br_dns_dmarc.lng
- interface/web/dns/lib/lang/br_dns_spf.lng 25 additions, 0 deletionsinterface/web/dns/lib/lang/br_dns_spf.lng
- interface/web/dns/lib/lang/br_dns_txt.lng 3 additions, 0 deletionsinterface/web/dns/lib/lang/br_dns_txt.lng
Loading
Please register or sign in to comment