gitlabFork/ISPConfig3.git - Solinfo Gitblit

Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2015-01-06 9724f8f13bdc6bfb2f9649c54ad37fb45bea9870

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, January 6, 2015 10:41 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, January 6, 2015 10:41 -0500
commit	9724f8f13bdc6bfb2f9649c54ad37fb45bea9870
tree	ab78dee00db03f7afea5729a99bfd72822f4dbf2 tree \| zip \| gz
parent	d2713e4bf2090bcd85e0c1d7b99f08575d12f133 view \| diff 551989a9bd9b134858f6709a2756ca9dcec82fd4 view \| diff

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

2 files deleted

66 files modified

66 files added

	interface/lib/classes/aps_guicontroller.inc.php	220 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/remote.d/aps.inc.php	318 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/server_config.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_dkim_edit.php	31 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_dkim_get.php	86 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_dmarc_edit.php	377 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_spf_edit.php	269 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_dmarc.tform.php	164 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_spf.tform.php	164 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_txt.tform.php	31 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ar_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ar_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ar_dns_txt.lng	29 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/bg_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/bg_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/bg_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/br_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/br_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/br_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_txt.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/de_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/de_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/de_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/el_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/el_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/el_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_txt.lng	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/es_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/es_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/es_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fi_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fi_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fi_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fr_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fr_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fr_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/hr_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/hr_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/hr_dns_txt.lng	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/hu_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/hu_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/hu_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/id_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/id_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/id_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/it_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/it_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/it_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ja_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ja_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ja_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/nl_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/nl_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/nl_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/pl_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/pl_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/pl_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/pt_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/pt_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/pt_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ro_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ro_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ro_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ru_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ru_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ru_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/se_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/se_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/se_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/sk_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/sk_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/sk_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/tr_dns_dmarc.lng	50 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/tr_dns_spf.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/tr_dns_txt.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/templates/dns_dkim_edit.htm	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/templates/dns_dmarc_edit.htm	100 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/js/dns_dkim.js	72 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/js/mail_domain_dkim.js	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/mail_domain_dkim_create.php	96 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/mail_domain_edit.php	161 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_domain_edit.htm	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/aps_do_operation.php	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/aps_installedpackages_list.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/backup_stats.php	39 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ar_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/bg_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/br_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_backup_stats_list.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/el_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_backup_stats_list.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/es_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fi_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fr_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hr_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hu_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/id_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/it_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ja_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/nl_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pl_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pt_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ro_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ru_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/se_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/sk_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/tr_aps_instances_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/module.conf.php	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/remote.conf.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/backup_stats.list.php	52 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/aps_instances_list.htm	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/backup_stats_list.htm	48 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/navigation.html	11 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/sites_aps_available_packages_list.html	29 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/sites_aps_get_package_details.html	29 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/sites_aps_get_package_file.html	29 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/sites_aps_get_package_settings.html	29 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/sites_aps_install_package.html	29 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/sites_aps_instance_delete.html	29 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/sites_aps_instance_get.html	29 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/sites_aps_instance_settings_get.html	29 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/sites_aps_update_package_list.html	29 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/bastille-firewall.cfg.master	2 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/aps_installer.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup_mail.inc.php	8 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/mail_plugin_dkim.inc.php	7 ●●●●● diff \| view \| raw \| blame \| history