ISPConfig3 devel
parent: 20e30b | patch | commitdiff
Marius Cramer
2014-01-24 e60d4c7e35e5dd3a5f4fb1d5b3a25345b6275146
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, January 24, 2014 06:41 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Friday, January 24, 2014 06:41 -0500
commite60d4c7e35e5dd3a5f4fb1d5b3a25345b6275146
tree 7de70ab4ed6ec8fab91b3c146b247a73ba4d442e tree | zip | gz
parent 20e30b45aaaf068b0391ff4679e4f44a0fae8d6e view | diff
f902e3bd4322fafacbb6f5717ca731db7ae3dba9 view | diff 
Merge remote-tracking branch 'renky/vhostalias'

Conflicts:
	interface/web/sites/web_aliasdomain_edit.php
57 files modified
66 files added
6369 ■■■■■ changed files
interface/lib/classes/remote.d/sites.inc.php 77 ●●●●● diff | view | raw | blame | history
interface/lib/plugins/sites_web_vhost_aliasdomain_plugin.inc.php 68 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/system_config.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ar_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/bg_system_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/br_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/cz_system_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_system_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_system_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fi_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fr_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hr_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hu_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/id_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ja_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/nl_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pl_system_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pt_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ro_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ru_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/se_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/sk_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/tr_system_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/system_config_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/system_config_sites_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/ajax_get_json.php 3 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/dashlets/limits.php 2 ●●●●● diff | view | raw | blame | history
interface/web/data.sql 51 ●●●●● diff | view | raw | blame | history
interface/web/index.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/aps_install_package.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_folder.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_aliasdomain.tform.php 735 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_subdomain.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ar_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ar_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/bg_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/bg_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/br_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/br_web_vhost_aliasdomain_list.lng 9 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/cz_web_vhost_aliasdomain.lng 119 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/cz_web_vhost_aliasdomain_list.lng 9 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_aliasdomain.lng 125 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_aliasdomain.lng 127 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fi_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fi_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hr_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hr_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hu_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hu_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/id_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/id_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/it_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/it_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ja_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ja_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/nl_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/nl_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pl_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pl_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pt_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pt_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ro_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ro_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ru_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ru_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/se_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/se_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/sk_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/sk_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/tr_web_vhost_aliasdomain.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/tr_web_vhost_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/module.conf.php 16 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/remote.conf.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/web_folder.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/web_vhost_aliasdomain.list.php 105 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_sites_stats_list.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_aliasdomain_advanced.htm 157 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_aliasdomain_backup.htm 36 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_aliasdomain_edit.htm 227 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_aliasdomain_list.htm 79 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_aliasdomain_redirect.htm 84 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_aliasdomain_ssl.htm 68 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_aliasdomain_stats.htm 37 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_childdomain_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_sites_stats.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_aliasdomain_del.php 73 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_aliasdomain_edit.php 658 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_aliasdomain_list.php 55 ●●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/admin/system_config_sites_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/main.tpl.htm 1 ●●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/sites/web_vhost_aliasdomain_advanced.htm 146 ●●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/sites/web_vhost_aliasdomain_backup.htm 32 ●●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/sites/web_vhost_aliasdomain_edit.htm 208 ●●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/sites/web_vhost_aliasdomain_list.htm 60 ●●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/sites/web_vhost_aliasdomain_redirect.htm 76 ●●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/sites/web_vhost_aliasdomain_ssl.htm 68 ●●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/sites/web_vhost_aliasdomain_stats.htm 37 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 1 ●●●●● diff | view | raw | blame | history
interface/web/themes/default_64_navimg/templates/main.tpl.htm 3 ●●●●● diff | view | raw | blame | history
interface/web/themes/default_combobox/templates/main.tpl.htm 3 ●●●●● diff | view | raw | blame | history
interface/web/themes/default_no_navimg/templates/main.tpl.htm 3 ●●●●● diff | view | raw | blame | history
server/lib/classes/aps_installer.inc.php 3 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/150-awstats.inc.php 6 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/150-webalizer.inc.php 6 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/200-logfiles.inc.php 4 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/300-quota_notify.inc.php 4 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/500-backup.inc.php 2 ●●●●● diff | view | raw | blame | history
server/mods-available/rescue_core_module.inc.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 60 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 52 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_reverseproxy_plugin.inc.php 6 ●●●●● diff | view | raw | blame | history