ISPConfig3 devel
parent: b63119 | patch | commitdiff
Marius Burkard
2016-07-01 49441bdd0f3ff75d5092d5b832b97ea722a66363
refs
author Marius Burkard <m.burkard@pixcept.de>
Friday, July 1, 2016 03:53 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Friday, July 1, 2016 03:53 -0400
commit49441bdd0f3ff75d5092d5b832b97ea722a66363
tree 94064b63a9cab8fd7f2a8999a62c59082f21a872 tree | zip | gz
parent b63119417fe6e4bbcd072108d7dec927ee879d4a view | diff
da3c0c44e13c665034d5922678388e3ee52e2da6 view | diff 
Merge branch 'stable-3.1'
1 files added
106 files modified
1393 ■■■■■ changed files
install/dist/lib/centos72.lib.php 40 ●●●●● diff | view | raw | blame | history
install/dist/lib/centos_base.lib.php 8 ●●●●● diff | view | raw | blame | history
install/dist/lib/fedora.lib.php 12 ●●●●● diff | view | raw | blame | history
install/install.php 658 ●●●●● diff | view | raw | blame | history
install/lib/install.lib.php 2 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 15 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_dev_collection.sql 15 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 19 ●●●●● diff | view | raw | blame | history
install/tpl/config.inc.php.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/helo_access.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/pureftpd_mysql.conf.master 20 ●●●●● diff | view | raw | blame | history
interface/lib/classes/quota_lib.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/session.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform.inc.php 18 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_base.inc.php 18 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/list/server_ip_map.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/directive_snippets_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client_template.tform.php 19 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_del.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_import.php 14 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 14 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_wizard.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_wizard.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/login/index.php 1 ●●●●● diff | view | raw | blame | history
interface/web/login/login_as.php 4 ●●●●● diff | view | raw | blame | history
interface/web/login/logout.php 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_alias.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_aliasdomain.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_blacklist.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_content_filter.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_domain.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_domain_catchall.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_forward.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_get.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_relay_recipient.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_spamfilter.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_transport.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_user.list.php 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/mail_whitelist.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/spamfilter_blacklist.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/spamfilter_policy.list.php 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/spamfilter_users.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/spamfilter_whitelist.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/list/xmpp_domain.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_user_edit.php 9 ●●●●● diff | view | raw | blame | history
interface/web/mail/xmpp_domain_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/pl.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/ajax_get_ip.php 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/aps_install_package.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_quota_stats.php 5 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/cron.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/database.list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/ftp_user.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/shell_user.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/web_childdomain.list.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_folder_user.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/web_vhost_domain.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/list/webdav_user.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 35 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/ispconfig.js 91 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/error.tpl.htm 1 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main_login.tpl.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ar_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/bg_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/br_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ca_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/cz_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/en_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/es_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fi_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fr_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hr_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hu_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/id_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/it_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ja_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/nl_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pl_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pt_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ro_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ru_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/se_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/sk_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/tr_usersettings.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/templates/import_ispconfig.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/vm/list/openvz_ip.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/list/openvz_ostemplate.list.php 4 ●●●●● diff | view | raw | blame | history
interface/web/vm/list/openvz_template.list.php 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/list/openvz_vm.list.php 2 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 14 ●●●●● diff | view | raw | blame | history
server/cron.php 24 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/500-backup_mail.inc.php 2 ●●●●● diff | view | raw | blame | history
server/lib/classes/db_mysql.inc.php 16 ●●●●● diff | view | raw | blame | history
server/lib/classes/system.inc.php 4 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 31 ●●●●● diff | view | raw | blame | history
server/plugins-available/backup_plugin.inc.php 1 ●●●●● diff | view | raw | blame | history
server/plugins-available/maildeliver_plugin.inc.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/maildrop_plugin.inc.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 28 ●●●●● diff | view | raw | blame | history
server/plugins-available/shelluser_jailkit_plugin.inc.php 14 ●●●●● diff | view | raw | blame | history
server/server.php 37 ●●●●● diff | view | raw | blame | history