ISPConfig3 devel
parent: 6495dd | patch | commitdiff
Marius Cramer
2015-10-22 796661c563939605d8c7ba7e01b7ecf62f9cd1cf
refs
author Marius Cramer <m.cramer@pixcept.de>
Thursday, October 22, 2015 07:59 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Thursday, October 22, 2015 07:59 -0400
commit796661c563939605d8c7ba7e01b7ecf62f9cd1cf
tree 613b90926cd80e3358e88b2b9afea5cb0f24a2ec tree | zip | gz
parent 6495dda10319bde4f972256963b9507c60502def view | diff
abee9093e1ffe3f2c56bf66203766cc7e0b1a2ed view | diff 
Merge branch 'master' into 'master'

FS#2403 - Disable apps vhost in server config

See merge request !235
1 files added
83 files modified
321 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 6 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 5 ●●●●● diff | view | raw | blame | history
install/tpl/server.ini.master 1 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_openvz.inc.php 66 ●●●●● diff | view | raw | blame | history
interface/lib/plugins/vm_openvz_plugin.inc.php 14 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ar_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/bg_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/br_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/cz_server_config.lng 1 ●●●●● 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/el_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/lib/lang/es_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fi_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fr_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hr_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hu_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/id_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ja_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/nl_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pl_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pt_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ro_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ru_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/se_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/sk_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/tr_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_web_edit.htm 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/form/openvz_template.tform.php 16 ●●●●● diff | view | raw | blame | history
interface/web/vm/form/openvz_vm.tform.php 28 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/ar_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/ar_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/bg_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/bg_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/br_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/br_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/cz_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/cz_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/de_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/de_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/el_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/el_openvz_vm.lng 3 ●●●●● 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 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/es_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/es_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fi_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fi_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/hr_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/hr_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/hu_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/hu_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/id_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/id_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/it_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/it_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/ja_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/ja_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/nl_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/nl_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/pl_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/pl_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/pt_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/pt_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/ro_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/ro_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/ru_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/ru_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/se_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/se_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/sk_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/sk_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/tr_openvz_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/tr_openvz_vm.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_vm_edit.php 3 ●●●●● diff | view | raw | blame | history
interface/web/vm/templates/openvz.conf.tpl 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/templates/openvz_template_advanced_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/vm/templates/openvz_vm_advanced_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/vm/templates/openvz_vm_edit.htm 5 ●●●●● diff | view | raw | blame | history
server/plugins-available/apps_vhost_plugin.inc.php 20 ●●●●● diff | view | raw | blame | history