ISPConfig3 devel
parent: ae171f | patch | commitdiff
tbrehm
2012-10-16 a008884b8f041577d43675f13c492f45fb9ee066
refs
author tbrehm <t.brehm@ispconfig.org>
Tuesday, October 16, 2012 10:38 -0400
committer tbrehm <t.brehm@ispconfig.org>
Tuesday, October 16, 2012 10:38 -0400
commita008884b8f041577d43675f13c492f45fb9ee066
tree aa032107accc4270f8f548f8221fcc9d60a7d533 tree | zip | gz
parent ae171fab6ed64f83f4a6ee71f4e12a6cf0e2c70b view | diff 
Merged revisions 3536-3555 from 3.0.5 stable branch.
2 files added
164 files modified
2264 ■■■■■ changed files
interface/lib/classes/ispcmail.inc.php 84 ●●●●● diff | view | raw | blame | history
interface/lib/lang/de.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de.lng 36 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_directive_snippets.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_directive_snippets_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_firewall.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_firewall_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_iptables.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_iptables_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_language_edit.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_language_import.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_language_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_package_install.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_remote_action.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_remote_user.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_remote_user_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 164 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_ip.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_ip_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_php.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_php_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_software_package_install.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_software_package_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_software_repo.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_software_repo_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_system_config.lng 44 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_tpl_default_admin.lng 26 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_users_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client.lng 117 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client_circle_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client_message.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client_template.lng 100 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_clients_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_domain.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_reseller.lng 123 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_resellers_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_circle_list.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/clients_list.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/resellers_list.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/ajax_get_json.php 11 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/de_dashlet_limits.lng 34 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_a.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_a_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_aaaa.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_alias.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_cname.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_hinfo.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_import.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_mx.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_ns.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_ptr.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_rp.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_slave.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_slave_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_soa.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_soa_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_srv.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_template_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_txt.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_wizard.lng 20 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/de.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/de_faq_manage_questions_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/de_faq_sections_form.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/de_help_faq_sections_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/js/jquery.tipsy.js 143 ●●●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 99 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/de.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_alias.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_alias_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_aliasdomain.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_blacklist.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_blacklist_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_domain.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_domain_admin_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_domain_catchall.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_forward.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_forward_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_get.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_mailinglist.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_relay_recipient.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_spamfilter.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_spamfilter_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_transport.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_transport_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_user.lng 20 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_user_filter.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_user_filter_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_user_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_user_stats_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_whitelist.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_blacklist.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_config.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_users_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_whitelist.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_user_quota_stats_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/user_quota_stats_list.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/user_quota_stats.php 8 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/de.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/de_index.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/de_mail_user_cc.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/de_mail_user_password.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/de.lng 74 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_aliasdomain.tform.php 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_domain.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_subdomain.tform.php 13 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_subdomain.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de.lng 28 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_aps.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_cron.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_cron_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_database.lng 20 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_database_admin_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_database_user_admin_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_database_user_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_ftp_user.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_ftp_user_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_shell_user.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_shell_user_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_user_quota_stats_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_aliasdomain.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_aliasdomain_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_backup_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_domain.lng 94 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_domain_admin_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_domain_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_folder.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_folder_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_folder_user.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_folder_user_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_sites_stats_list.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_subdomain.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_subdomain_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_subdomain.lng 77 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_webdav_user.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_webdav_user_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_aliasdomain.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/aps_packages_list.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_admin_list.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/database_list.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/user_quota_stats_list.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/themes/default-304/templates/main.tpl.htm 16 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/css/styles.css 16 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 33 ●●●●● diff | view | raw | blame | history
interface/web/themes/default_64_navimg/templates/main.tpl.htm 23 ●●●●● diff | view | raw | blame | history
interface/web/themes/default_combobox/templates/main.tpl.htm 23 ●●●●● diff | view | raw | blame | history
interface/web/themes/default_no_navimg/templates/main.tpl.htm 23 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_import_ispconfig.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_interface.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_resync.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_tpl_default.lng 6 ●●●●● diff | view | raw | blame | history
server/conf/nginx_vhost.conf.master 2 ●●●●● diff | view | raw | blame | history