gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

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

Marius Cramer

2014-12-19 62e25488daa4f857f717d2687e820091ffaa8a13

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Friday, December 19, 2014 12:21 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Friday, December 19, 2014 12:21 -0500
commit	62e25488daa4f857f717d2687e820091ffaa8a13
tree	764b2973bc94984f6e9c63882db6b0d55b1a7f4f tree \| zip \| gz
parent	77cc4a99b15f4639b56c29a1207dc04b459c5d54 view \| diff ccfc84e610de6a58eeb3b8f49209b82a9124c309 view \| diff

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

Conflicts:
	interface/web/themes/default/templates/main.tpl.htm

42 files modified

6 files added

	install/sql/incremental/upd_0079.sql	2 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_0080.sql	1 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	3 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/server.ini.master	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/db_mysql.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/plugin_directive_snippets.inc.php	72 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/validate_client.inc.php	78 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/lang/en.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/directive_snippets.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/server_config.tform.php	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/de_directive_snippets.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/de_server_config.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_directive_snippets.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_server_config.lng	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/directive_snippets_edit.htm	17 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/server_config_web_edit.htm	10 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/client.tform.php	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/reseller.tform.php	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/de_client.lng	28 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/de_reseller.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_client.lng	25 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/client_edit_limits.htm	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/js/scrigo.js.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/login/password_reset.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_mail_forward.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/ajax_get_json.php	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/form/web_vhost_domain.tform.php	17 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_directive_snippets.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_vhost_domain.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_directive_snippets.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_vhost_domain.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_directive_snippets.htm	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_vhost_domain_advanced.htm	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_vhost_domain_edit.htm	23 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_vhost_domain_ssl.htm	10 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_vhost_domain_edit.php	12 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/themes/default/templates/main.tpl.htm	1 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/apache_apps.vhost.master	10 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/nginx_vhost.conf.master	6 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/php-cgi-starter.master	4 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/php-fcgi-starter.master	3 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/php_fpm_pool.conf.master	4 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/vhost.conf.master	3 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/db_mysql.inc.php	4 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/apache2_plugin.inc.php	6 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/nginx_plugin.inc.php	11 ●●●●● diff \| view \| raw \| blame \| history