Marius Burkard
2016-01-04 d22277878254cf33fd63ca1bf12b215f4e030a27
refs
author Marius Burkard <m.burkard@pixcept.de>
Monday, January 4, 2016 05:12 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Monday, January 4, 2016 05:12 -0500
commitd22277878254cf33fd63ca1bf12b215f4e030a27
tree bca6ae1ac04cf2196626563a8282bee930d79559 tree | zip | gz
parent 0cc28615e96957316b138212795bcff4a0cd0ed6 view | diff
- merged different fixes and updates from foreign branches
41 files modified
1559 ■■■■ changed files
install/install.php 11 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 78 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 5 ●●●●● diff | view | raw | blame | history
install/tpl/server.ini.master 6 ●●●● diff | view | raw | blame | history
interface/lib/classes/functions.inc.php 328 ●●●●● diff | view | raw | blame | history
interface/lib/classes/listform.inc.php 33 ●●●●● diff | view | raw | blame | history
interface/lib/classes/remote.d/client.inc.php 42 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_base.inc.php 3 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_password.inc.php 3 ●●●● diff | view | raw | blame | history
interface/web/admin/directive_snippets_edit.php 53 ●●●●● diff | view | raw | blame | history
interface/web/admin/directive_snippets_list.php 45 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/directive_snippets.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 104 ●●●●● diff | view | raw | blame | history
interface/web/admin/list/directive_snippets.list.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/directive_snippets_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/directive_snippets_list.htm 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_server_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/client/client_del.php 4 ●●●● diff | view | raw | blame | history
interface/web/client/client_list.php 20 ●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 12 ●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 16 ●●●● diff | view | raw | blame | history
interface/web/client/list/client.list.php 11 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/clients_list.htm 17 ●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_domain_edit.htm 2 ●●● diff | view | raw | blame | history
interface/web/sites/ajax_get_json.php 13 ●●●● diff | view | raw | blame | history
interface/web/sites/database_quota_stats.php 67 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/database.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_domain.tform.php 18 ●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_admin_list.htm 10 ●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_advanced.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_edit.htm 69 ●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 268 ●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/sidenav.tpl.htm 11 ●●●●● diff | view | raw | blame | history
server/conf/hhvm_starter.master 2 ●●● diff | view | raw | blame | history
server/conf/nginx_vhost.conf.master 24 ●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 1 ●●●● diff | view | raw | blame | history
server/lib/classes/cronjob.inc.php 31 ●●●● diff | view | raw | blame | history
server/mods-available/web_module.inc.php 24 ●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 24 ●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 132 ●●●● diff | view | raw | blame | history
server/plugins-available/shelluser_jailkit_plugin.inc.php 22 ●●●●● diff | view | raw | blame | history