Marius Cramer
2014-04-23 9b3069a1eacd3cbda0bfe565925e80f667f6c96d
refs
author Marius Cramer <m.cramer@pixcept.de>
Wednesday, April 23, 2014 11:22 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Wednesday, April 23, 2014 11:22 -0400
commit9b3069a1eacd3cbda0bfe565925e80f667f6c96d
tree d25ffb1c0ff760dffbec9609e5584a538cb7a79c tree | zip | gz
parent b18806e03f4f0b71194308eee3574ede70d61bbb view | diff
9b6866008bf2dcd3fbbb4bc9e0eb64b0ed113331 view | diff
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
TODO.txt
install/sql/ispconfig3.sql
install/tpl/config.inc.php.master
install/tpl/fedora_dovecot2.conf.master
interface/lib/config.inc.php
interface/web/admin/lib/lang/el_system_config.lng
interface/web/client/lib/lang/fr_reseller.lng
interface/web/dns/lib/lang/fr_dns_import.lng
interface/web/dns/lib/lang/fr_dns_soa.lng
interface/web/dns/lib/lang/fr_dns_wizard.lng
interface/web/mail/lib/lang/fr_mail_user.lng
interface/web/monitor/lib/lang/fr.lng
interface/web/sites/lib/lang/el_web_childdomain.lng
interface/web/sites/lib/lang/el_web_childdomain_list.lng
interface/web/sites/lib/lang/el_web_subdomain.lng
interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng
interface/web/sites/lib/lang/fr_web_aliasdomain.lng
interface/web/sites/lib/lang/fr_web_subdomain.lng
interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng
interface/web/themes/blue/ispconfig_version
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php
208 files modified
2947 ■■■■ changed files
TODO.txt 4 ●●●● diff | view | raw | blame | history
install/dist/lib/debian60.lib.php 2 ●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 3 ●●●● diff | view | raw | blame | history
install/tpl/fedora_dovecot2.conf.master 1 ●●●● diff | view | raw | blame | history
interface/lib/classes/ispcmail.inc.php 10 ●●●● diff | view | raw | blame | history
interface/lib/lang/el.lng 128 ●●●● diff | view | raw | blame | history
interface/lib/lang/fr.lng 128 ●●●● diff | view | raw | blame | history
interface/web/admin/form/firewall.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el.lng 12 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_directive_snippets.lng 10 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_directive_snippets_list.lng 8 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_firewall.lng 2 ●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_remote_action.lng 4 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_remote_user.lng 10 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_server_config.lng 72 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_server_ip.lng 2 ●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_server_php.lng 22 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_server_php_list.lng 8 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_software_package.lng 8 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_software_package_list.lng 4 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_software_update_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_system_config.lng 22 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_tpl_default_admin.lng 26 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_users.lng 12 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_users_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fr_system_config.lng 2 ●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el.lng 24 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_client.lng 76 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_client_circle.lng 14 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_client_circle_list.lng 16 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_client_message.lng 32 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_client_template.lng 38 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_clients_list.lng 4 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_domain_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_reseller.lng 62 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_resellers_list.lng 4 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr.lng 26 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client.lng 88 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client_circle.lng 12 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client_circle_list.lng 14 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client_del.lng 4 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client_message.lng 30 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client_template.lng 54 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client_template_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_clients_list.lng 4 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_domain.lng 2 ●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_reseller.lng 89 ●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_resellers_list.lng 8 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/el.lng 2 ●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/el_dashlet_limits.lng 50 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/el_dashlet_mailquota.lng 12 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/el_dashlet_quota.lng 12 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng 10 ●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/fr_dashlet_quota.lng 12 ●●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/cz_module_edit.lng 2 ●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/el_form_edit.lng 10 ●●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/fr_form_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/fr_form_show.lng 2 ●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/fr_module_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/designer/lib/lang/fr_module_show.lng 6 ●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_srv.tform.php 2 ●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el.lng 4 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_alias.lng 2 ●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_hinfo.lng 2 ●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_import.lng 20 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_mx.lng 2 ●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_slave.lng 2 ●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_soa.lng 14 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_srv.lng 28 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/el_dns_wizard.lng 18 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr.lng 4 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_a_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_import.lng 22 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_mx.lng 2 ●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_slave.lng 4 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_soa.lng 16 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_srv.lng 4 ●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/fr_dns_wizard.lng 16 ●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/el_help_faq_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/help/lib/lang/fr_help_faq_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/help/lib/lang/fr_help_faq_sections_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/help/lib/lang/fr_support_message.lng 10 ●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/el.lng 14 ●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/fr.lng 14 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/ar_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/bg_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/br_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/cz_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_get.lng 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_mail_alias.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_mail_domain_catchall.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_mail_forward.lng 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_mail_get.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_mail_mailinglist.lng 18 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_mail_spamfilter.lng 6 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_mail_transport.lng 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_mail_transport_list.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_mail_user.lng 20 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_mail_user_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_spamfilter_users.lng 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/el_user_quota_stats_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/fi_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/fr_mail_get.lng 3 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/fr_mail_user.lng 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/fr_mail_user_stats_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/hr_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/hu_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/id_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/it_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/ja_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/nl_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/pl_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/pt_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/ro_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/ru_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/se_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/sk_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/tr_mail_get.lng 1 ●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/el.lng 14 ●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/el_index.lng 18 ●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/el_mail_user_autoresponder.lng 22 ●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/el_mail_user_cc.lng 8 ●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/el_mail_user_filter.lng 36 ●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/el_mail_user_filter_list.lng 12 ●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/el_mail_user_password.lng 14 ●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/el_mail_user_spamfilter.lng 8 ●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/el.lng 14 ●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/el_datalog_list.lng 10 ●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/fr.lng 16 ●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/fr_datalog_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ar_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/bg_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/br_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/cz_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el.lng 24 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_aps.lng 110 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_aps_instances_list.lng 22 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_aps_packages_list.lng 12 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_aps_update_packagelist.lng 8 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_cron.lng 4 ●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_database.lng 44 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_database_user.lng 42 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_database_user_admin_list.lng 8 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_database_user_list.lng 6 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_ftp_user.lng 14 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_shell_user.lng 18 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_shell_user_list.lng 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_user_quota_stats_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_web_backup_list.lng 26 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_web_childdomain.lng 9 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_web_childdomain_list.lng 1 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_web_folder_user.lng 10 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_web_sites_stats_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_web_vhost_domain.lng 40 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_webdav_user.lng 14 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fi_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr.lng 22 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_aps.lng 98 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_aps_instances_list.lng 18 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_aps_packages_list.lng 10 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_ftp_user.lng 12 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_shell_user.lng 18 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_user_quota_stats_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_web_folder_user.lng 12 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_web_vhost_domain.lng 78 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_webdav_user.lng 12 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hr_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hu_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/id_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/it_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ja_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/nl_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pl_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pt_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ro_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ru_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/se_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/sk_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/tr_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/interface_settings.php 2 ●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el.lng 8 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_import_ispconfig.lng 42 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_index.lng 4 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_interface.lng 10 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_resync.lng 22 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_tpl_default.lng 10 ●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_usersettings.lng 10 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/el_openvz_ip.lng 2 ●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/el_openvz_ip_list.lng 2 ●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/el_openvz_template.lng 20 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/el_openvz_vm.lng 8 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_action.lng 28 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_ip.lng 12 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_ip_list.lng 8 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_ostemplate.lng 16 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng 8 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_template.lng 132 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_template_list.lng 6 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_vm.lng 62 ●●●● diff | view | raw | blame | history
interface/web/vm/lib/lang/fr_openvz_vm_list.lng 10 ●●●● diff | view | raw | blame | history
server/conf/php_fpm_pool.conf.master 2 ●●● diff | view | raw | blame | history
server/mods-available/web_module.inc.php 12 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 25 ●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 24 ●●●● diff | view | raw | blame | history