gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

refs
author	Marius Burkard <m.burkard@pixcept.de>
	Wednesday, May 4, 2016 07:27 -0400
committer	Marius Burkard <m.burkard@pixcept.de>
	Wednesday, May 4, 2016 07:27 -0400
commit	c3189ce6c7301c3ec17878fd3918f31d0d3cb18a
tree	b60a2a9942cf528a8b1fb4f073e33f548999110e tree \| zip \| gz
parent	5152e9a75e6e0ed4dc26358e4e608ce684147b32 view \| diff d933cc2708fe10e648a9b454ba4c0b81ebb606c7 view \| diff

Merge branch 'stable-3.1'

1 files added

45 files modified

	install/install.php	5 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_0082.sql	1 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/apache_ispconfig.vhost.master	86 ●●●●● diff \| view \| raw \| blame \| history
	install/update.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/json_handler.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/tform_base.inc.php	19 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/de_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_server_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/system_config_domains_edit.htm	12 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/client.tform.php	16 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/reseller.tform.php	16 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/client_template_edit_limits.htm	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/domain_list.htm	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/dashlets/templates/modules.htm	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/ar_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/bg_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/br_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/ca_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/cz_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/de_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/el_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/en_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/es_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/fi_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/fr_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/hr_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/hu_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/id_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/it_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/ja_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/nl_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/pl_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/pt_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/ro_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/ru_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/se_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/sk_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/tr_dashlet_modules.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_alias.tform.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_soa.tform.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_sites_stats_list.htm	16 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_vhost_domain_edit.php	1 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/apache_ispconfig.conf.master	13 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/nginx_vhost.conf.master	8 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/apache2_plugin.inc.php	31 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/nginx_plugin.inc.php	31 ●●●●● diff \| view \| raw \| blame \| history