gitlabFork/ISPConfig3.git - Solinfo Gitblit

Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-03-06 82b723df86594a89fb53607981488319e39b1b92

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Thursday, March 6, 2014 08:53 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Thursday, March 6, 2014 08:53 -0500
commit	82b723df86594a89fb53607981488319e39b1b92
tree	5abfc1c66741b1bbfaa9c4df8a4b2c39d2c2f26d tree \| zip \| gz
parent	35b30fa77ef939f85b6d31446e8710e8f03486b6 view \| diff a80ae1992c90a92245ec694438be201d7231c8e6 view \| diff

Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/dns/lib/lang/cz_dns_dkim.lng
	interface/web/mail/lib/lang/cz_mail_backup_list.lng
	interface/web/mail/lib/lang/cz_mail_user.lng
	interface/web/sites/lib/lang/cz_web_childdomain.lng
	interface/web/sites/lib/lang/cz_web_childdomain_list.lng
	interface/web/sites/lib/lang/cz_web_subdomain_list.lng
	interface/web/sites/lib/lang/cz_web_vhost_domain.lng
	interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
	interface/web/sites/web_vhost_domain_edit.php

8 files added

76 files modified

1 files renamed

19 files deleted

	docs/INSTALL.txt	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_CENTOS_5.2.txt	249 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_CENTOS_5.4_dovecot_bind.txt	237 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_DEBIAN_4.0.txt	214 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_DEBIAN_5.0_courier_mydns.txt	370 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt	250 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_DEBIAN_5.0_multiserver.txt	47 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_DEBIAN_6.0_courier_mydns.txt	399 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt	279 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_FEDORA_12_dovecot_bind.txt	154 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_FEDORA_9.txt	215 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_OPENSUSE_11.txt	201 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_OPENSUSE_11_1.txt	210 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_OPENSUSE_11_2.txt	173 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_OPENSUSE_11_3.txt	195 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_POWERDNS_DEBIAN_5.txt	7 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_UBUNTU_7.10.txt	111 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_UBUNTU_8.04.txt	438 ●●●●● diff \| view \| raw \| blame \| history
	docs/INSTALL_UBUNTU_8.10.txt	450 ●●●●● diff \| view \| raw \| blame \| history
	docs/LOCALIZE_DEBIAN_LENNY.txt	144 ●●●●● diff \| view \| raw \| blame \| history
	docs/under_development/CHROOTED_DEBIAN_5.0.txt	diff \| view \| raw \| blame \| history
	install/dist/lib/fedora.lib.php	38 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/gentoo.lib.php	32 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/opensuse.lib.php	43 ●●●●● diff \| view \| raw \| blame \| history
	install/install.php	3 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/classes/tpl.inc.php	1431 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/classes/tpl_cache.inc.php	193 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/classes/tpl_error.inc.php	95 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/classes/tpl_ini.inc.php	119 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/install.lib.php	25 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	61 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/apache_apps.vhost.master	46 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/apache_ispconfig.conf.master	76 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/apache_ispconfig.vhost.master	30 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/debian_postfix.conf.master	2 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/fedora_postfix.conf.master	2 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/gentoo_postfix.conf.master	2 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/nginx_apps.vhost.master	2 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/opensuse_postfix.conf.master	2 ●●●●● diff \| view \| raw \| blame \| history
	install/update.php	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/remote.d/sites.inc.php	26 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/config.inc.php	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/lang/cz.lng	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_directive_snippets.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_language_import.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_login_as.lng	12 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_server_config.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_system_config.lng	16 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_users.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/cz.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/cz_client.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/cz_client_message.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/cz_client_message_template.lng	12 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/cz_client_message_template_list.lng	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/cz_client_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/cz_reseller.lng	15 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/designer/lib/lang/cz_module_nav_item_edit.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/designer/lib/lang/cz_module_show.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_a.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_aaaa.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_alias.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_cname.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_hinfo.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_mx.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_ns.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_ptr.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_rp.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_srv.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_txt.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/help/lib/lang/cz.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/help/lib/lang/cz_help_faq_sections_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/login/lib/lang/cz.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz.lng	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_alias_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_blacklist_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_transport_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_user.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_spamfilter_users.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_user_quota_stats_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mailuser/lib/lang/cz_mail_user_cc.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/database_edit.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz.lng	12 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_cron.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_database_admin_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_database_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_database_user_admin_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_ftp_user.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_ftp_user_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_shell_user.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_shell_user_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_user_quota_stats_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_web_childdomain.lng	40 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_web_childdomain_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_web_vhost_domain.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_webdav_user_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/cz_resync.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/nginx_apps.vhost.master	2 ●●●●● diff \| view \| raw \| blame \| history