gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2014-02-25 0e3e3c99217c80068fe620460c7a331c34fe1b40

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, February 25, 2014 09:29 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, February 25, 2014 09:29 -0500
commit	0e3e3c99217c80068fe620460c7a331c34fe1b40
tree	00f4921daafa2c633fe6f1117a2afa691abffcea tree \| zip \| gz
parent	3faab0ca9e097627420aec19c01ad8336fe79c22 view \| diff cce9d63279d9078dd0292dd015be497600ac5f32 view \| diff

 Merge branch 'master' into 'master'

Master

42 files modified

5 files added

	install/lib/installer_base.lib.php	2 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_0071.sql	7 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	3 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/server.ini.master	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/tools_monitor.inc.php	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/server_config.tform.php	12 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_server_config.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/server_config_web_edit.htm	12 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/client.tform.php	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/client_template.tform.php	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_client.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_client_template.lng	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/client_edit_limits.htm	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/client_template_edit_limits.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_dkim.tform.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ar_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/bg_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/br_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/de_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/el_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/es_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fi_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fr_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/hr_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/hu_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/id_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/it_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ja_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/nl_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ru_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/se_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/sk_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/tr_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/database_edit.php	16 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/form/database.tform.php	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_database.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/database_edit.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/db_quota_notification_de.txt	13 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/db_quota_notification_en.txt	13 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/db_quota_ok_notification_de.txt	13 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/mail/db_quota_ok_notification_en.txt	13 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/100-monitor_clamav_log.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/100-monitor_database_size.inc.php	59 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/300-quota_notify.inc.php	118 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup_mail.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history