ISPConfig3 devel
parent: 681d3f | patch | commitdiff
Dominik Müller
2014-01-19 6e8071c5e2eb86a280180638a73ad80e7264f133
refs
author Dominik Müller <info@profi-webdesign.net>
Sunday, January 19, 2014 17:13 -0500
committer Dominik Müller <info@profi-webdesign.net>
Sunday, January 19, 2014 17:13 -0500
commit6e8071c5e2eb86a280180638a73ad80e7264f133
tree d4d3440915c808927657594a5e14bb039525c38e tree | zip | gz
parent 681d3f5933292665fd95c211cee747ab6060ac24 view | diff
33ff5ab0760d15eba6c7773d559bfa3ab018c9a1 view | diff 
Merge branch 'vhostalias' of /home/git/repositories/renky/ispconfig3
66 files added
59 files modified
6375 ■■■■■ changed files
interface/lib/classes/remote.d/sites.inc.php 69 ●●●●● 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_aliasdomain.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_folder.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_subdomain.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_aliasdomain.tform.php 737 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_subdomain.tform.php 6 ●●●●● 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 10 ●●●●● 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_aliasdomain_edit.php 4 ●●●●● 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 663 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_aliasdomain_list.php 55 ●●●●● diff | view | raw | blame | history
interface/web/themes/blue/templates/main.tpl.htm 1 ●●●●● 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