gitlabFork/ISPConfig3.git - Solinfo Gitblit

Marius Cramer

2015-05-07 f6e42fc631acad20006ad79f63ccecc0a86ad0eb

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Thursday, May 7, 2015 11:26 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Thursday, May 7, 2015 11:26 -0400
commit	f6e42fc631acad20006ad79f63ccecc0a86ad0eb
tree	84af47813632f3d3e4e286ae76b265886f185cc9 tree \| zip \| gz
parent	be531cf1d37d2293a572eef25d0190e23fc8a3b4 view \| diff 5a56e6a9966a656796685494bf75902d01fae3df view \| diff

Merge branch 'master' into 'master'

Prevent empty hostname during install

See merge request !184

56 files modified

	install/install.php	10 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_dev_collection.sql	2 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/plugins/vm_openvz_plugin.inc.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/server_config.tform.php	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/form/openvz_template.tform.php	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/form/openvz_vm.tform.php	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ar_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ar_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/bg_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/bg_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/br_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/br_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/cz_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/cz_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/de_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/de_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/el_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/el_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/en_openvz_template.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/en_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/es_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/es_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fi_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fi_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fr_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/fr_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hr_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hr_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hu_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/hu_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/id_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/id_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/it_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/it_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ja_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ja_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/nl_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/nl_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pl_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pl_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pt_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/pt_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ro_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ro_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ru_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/ru_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/se_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/se_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/sk_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/sk_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/tr_openvz_template.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/lib/lang/tr_openvz_vm.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/templates/openvz.conf.tpl	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/templates/openvz_template_advanced_edit.htm	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/vm/templates/openvz_vm_advanced_edit.htm	4 ●●●●● diff \| view \| raw \| blame \| history