ISPConfig3 devel
parent: 8cddcd | patch | commitdiff
tbrehm
2011-10-21 8ab3cdc09cfbac3157e996664616c229214f6c8d
refs
author tbrehm <t.brehm@ispconfig.org>
Friday, October 21, 2011 06:03 -0400
committer tbrehm <t.brehm@ispconfig.org>
Friday, October 21, 2011 06:03 -0400
commit8ab3cdc09cfbac3157e996664616c229214f6c8d
tree 0e27811fd8419938fdecff2f1e50d48a269fb711 tree | zip | gz
parent 8cddcd77993afabec9712245d47646b99c51467a view | diff 
Merged revisions 2681-2739 from 3.0.4 stable branch.
12 files added
214 files modified
1 files deleted
5541 ■■■■■ changed files
install/dist/lib/fedora.lib.php 8 ●●●●● diff | view | raw | blame | history
install/dist/lib/gentoo.lib.php 2 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 2 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0026.sql 1 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 2 ●●●●● diff | view | raw | blame | history
install/tpl/config.inc.php.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/nginx_apps.vhost.master 36 ●●●●● diff | view | raw | blame | history
install/tpl/server.ini.master 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/custom_datasource.inc.php 25 ●●●●● diff | view | raw | blame | history
interface/lib/classes/listform.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/listform_actions.inc.php 18 ●●●●● diff | view | raw | blame | history
interface/lib/classes/remoting.inc.php 10 ●●●●● diff | view | raw | blame | history
interface/lib/lang/hr.lng 12 ●●●●● diff | view | raw | blame | history
interface/lib/lang/it.lng 44 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server.tform.php 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ar_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/bg_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/br_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/cz_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fi_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fr_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hr.lng 68 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hr_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hu_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/id_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_firewall.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_firewall_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_groups_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_language_complete.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_language_edit.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_language_export.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_language_import.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_package_install.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_remote_user_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_server.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_server_config.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_server_ip.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_software_repo.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_software_update_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_system_config.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_users.lng 38 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_users_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ja_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/nl_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pl_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pt_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ro_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ru_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/se_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/sk_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/tr_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/language_export.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_rescue_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_edit_services.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_list.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/client_del.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it_client.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it_client_del.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it_client_template.lng 118 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it_clients_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it_resellers_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/hr_dashlet_limits.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/it.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/it_dashlet_limits.lng 54 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/it_dashlet_modules.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/it_form_edit.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/it_form_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/it_module_edit.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/it_module_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/it_module_nav_edit.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/it_module_nav_item_edit.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/it_module_show.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_import.php 282 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_slave_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_soa_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_soa.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ar.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/bg.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/br.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/cz.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fi.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hr.lng 17 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hr_dns_txt.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hr_dns_wizard.lng 46 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/hu.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/id.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/it.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/it_dns_soa.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ja.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/nl.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pl.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/pt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ro.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/ru.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/se.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/sk.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/tr.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_import.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/domain/lib/lang/it.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/domain/lib/lang/it_domain.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/domain/lib/lang/it_domain_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/module.conf.php 31 ●●●●● diff | view | raw | blame | history
interface/web/help/version.php 6 ●●●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 2 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/hr.lng 28 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/it.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it.lng 70 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it_mail_alias.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it_mail_domain.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it_mail_domain_admin_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it_mail_user_filter_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it_mail_user_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it_mail_user_stats_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it_spamfilter_config_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it_spamfilter_whitelist.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/ar.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/bg.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/br.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/cz.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/de.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/el.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/en.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/es.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/fi.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/fr.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/hr.lng 207 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/hr_datalog_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/hu.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/id.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/it.lng 77 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/it_datalog_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/it_syslog_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/ja.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/nl.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/pl.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/pt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/ro.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/ru.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/se.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/sk.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/tr.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/ajax_get_ip.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/webdav_user.tform.php 7 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ar_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/bg_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/br_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/cz_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fi_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hr.lng 36 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hr_database_admin_list.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hr_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hu_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/id_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/it.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/it_database.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/it_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/it_user_quota_stats_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/it_web_domain.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ja_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/nl_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pl_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pt_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ro_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ru_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/se_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/sk_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/tr_shell_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/shell_user_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/shell_user_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_aliasdomain_edit.htm 20 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_domain_redirect.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_subdomain_edit.htm 21 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_del.php 31 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_edit.php 12 ●●●●● diff | view | raw | blame | history
interface/web/temp/en.lng 2131 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/it_usersettings.lng 4 ●●●●● 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 2 ●●●●● 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 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_vm_edit.php 8 ●●●●● diff | view | raw | blame | history
interface/web/vm/templates/openvz_ip_edit.htm 8 ●●●●● diff | view | raw | blame | history
remoting_client/examples/sites_web_domain_add.php 9 ●●●●● diff | view | raw | blame | history
server/conf/awstats_index.php.master 20 ●●●●● diff | view | raw | blame | history
server/conf/bind_pri.domain.master 2 ●●●●● diff | view | raw | blame | history
server/conf/error/hr/400.html 61 ●●●●● diff | view | raw | blame | history
server/conf/error/hr/401.html 61 ●●●●● diff | view | raw | blame | history
server/conf/error/hr/403.html 61 ●●●●● diff | view | raw | blame | history
server/conf/error/hr/404.html 61 ●●●●● diff | view | raw | blame | history
server/conf/error/hr/405.html 61 ●●●●● diff | view | raw | blame | history
server/conf/error/hr/500.html 61 ●●●●● diff | view | raw | blame | history
server/conf/error/hr/502.html 61 ●●●●● diff | view | raw | blame | history
server/conf/error/hr/503.html 61 ●●●●● diff | view | raw | blame | history
server/conf/index/standard_index.html_hr 60 ●●●●● diff | view | raw | blame | history
server/conf/index/user_standard_index.html_hr 60 ●●●●● diff | view | raw | blame | history
server/conf/mail/welcome_email_hr.txt 4 ●●●●● diff | view | raw | blame | history
server/conf/nginx_apps.vhost.master 36 ●●●●● diff | view | raw | blame | history
server/conf/nginx_vhost.conf.master 10 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 48 ●●●●● diff | view | raw | blame | history
server/cron_daily.php 2 ●●●●● diff | view | raw | blame | history
server/lib/classes/monitor_tools.inc.php 3 ●●●●● diff | view | raw | blame | history
server/mods-available/rescue_core_module.inc.php 32 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 122 ●●●●● diff | view | raw | blame | history
server/plugins-available/apps_vhost_plugin.inc.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 254 ●●●●● diff | view | raw | blame | history
server/plugins-available/shelluser_base_plugin.inc.php 64 ●●●●● diff | view | raw | blame | history
server/plugins-available/shelluser_jailkit_plugin.inc.php 66 ●●●●● diff | view | raw | blame | history