Skip to content
  1. Nov 14, 2013
    • Marius Cramer's avatar
      b1a6a5a3
    • Marius Cramer's avatar
      Merge remote-tracking branch 'origin/stable-3.0.5' · 7cf3e980
      Marius Cramer authored
      Conflicts:
      	install/install.php
      	install/tpl/server.ini.master
      	interface/lib/classes/aps_guicontroller.inc.php
      	interface/lib/classes/tform.inc.php
      	interface/lib/lang/de.lng
      	interface/web/admin/form/server_config.tform.php
      	interface/web/admin/lib/lang/de.lng
      	interface/web/admin/lib/lang/de_directive_snippets.lng
      	interface/web/admin/lib/lang/de_directive_snippets_list.lng
      	interface/web/admin/lib/lang/de_firewall.lng
      	interface/web/admin/lib/lang/de_firewall_list.lng
      	interface/web/admin/lib/lang/de_groups.lng
      	interface/web/admin/lib/lang/de_groups_list.lng
      	interface/web/admin/lib/lang/de_iptables.lng
      	interface/web/admin/lib/lang/de_iptables_list.lng
      	interface/web/admin/lib/lang/de_language_add.lng
      	interface/web/admin/lib/lang/de_language_complete.lng
      	interface/web/admin/lib/lang/de_language_edit.lng
      	interface/web/admin/lib/lang/de_language_export.lng
      	interface/web/admin/lib/lang/de_language_import.lng
      	interface/web/admin/lib/lang/de_language_list.lng
      	interface/web/admin/lib/lang/de_login_as.lng
      	interface/web/admin/lib/lang/de_package_install.lng
      	interface/web/admin/lib/lang/de_remote_action.lng
      	interface/web/admin/lib/lang/de_remote_user.lng
      	interface/web/admin/lib/lang/de_remote_user_list.lng
      	interface/web/admin/lib/lang/de_server.lng
      	interface/web/admin/lib/lang/de_server_config.lng
      	interface/web/admin/lib/lang/de_server_config_list.lng
      	interface/web/admin/lib/lang/de_server_ip.lng
      	interface/web/admin/lib/lang/de_server_ip_list.lng
      	interface/web/admin/lib/lang/de_server_list.lng
      	interface/web/admin/lib/lang/de_server_php.lng
      	interface/web/admin/lib/lang/de_server_php_list.lng
      	interface/web/admin/lib/lang/de_software_package.lng
      	interface/web/admin/lib/lang/de_software_package_install.lng
      	interface/web/admin/lib/lang/de_software_package_list.lng
      	interface/web/admin/lib/lang/de_software_repo.lng
      	interface/web/admin/lib/lang/de_software_repo_list.lng
      	interface/web/admin/lib/lang/de_software_update_list.lng
      	interface/web/admin/lib/lang/de_system_config.lng
      	interface/web/admin/lib/lang/de_tpl_default_admin.lng
      	interface/web/admin/lib/lang/de_users.lng
      	interface/web/admin/lib/lang/de_users_list.lng
      	interface/web/admin/templates/server_config_server_edit.htm
      	interface/web/client/lib/lang/de.lng
      	interface/web/client/lib/lang/de_client.lng
      	interface/web/client/lib/lang/de_client_circle.lng
      	interface/web/client/lib/lang/de_client_circle_list.lng
      	interface/web/client/lib/lang/de_client_del.lng
      	interface/web/client/lib/lang/de_client_message.lng
      	interface/web/client/lib/lang/de_client_template.lng
      	interface/web/client/lib/lang/de_client_template_list.lng
      	interface/web/client/lib/lang/de_clients_list.lng
      	interface/web/client/lib/lang/de_domain.lng
      	interface/web/client/lib/lang/de_domain_list.lng
      	interface/web/client/lib/lang/de_reseller.lng
      	interface/web/client/lib/lang/de_resellers_list.lng
      	interface/web/dashboard/dashlets/quota.php
      	interface/web/dashboard/lib/lang/de.lng
      	interface/web/dashboard/lib/lang/de_dashlet_limits.lng
      	interface/web/dashboard/lib/lang/de_dashlet_mailquota.lng
      	interface/web/dashboard/lib/lang/de_dashlet_modules.lng
      	interface/web/dashboard/lib/lang/de_dashlet_quota.lng
      	interface/web/designer/lib/lang/de.lng
      	interface/web/designer/lib/lang/de_form_edit.lng
      	interface/web/designer/lib/lang/de_form_list.lng
      	interface/web/designer/lib/lang/de_module_edit.lng
      	interface/web/designer/lib/lang/de_module_list.lng
      	interface/web/designer/lib/lang/de_module_nav_edit.lng
      	interface/web/designer/lib/lang/de_module_nav_item_edit.lng
      	interface/web/designer/lib/lang/de_module_show.lng
      	interface/web/dns/lib/lang/de.lng
      	interface/web/dns/lib/lang/de_dns_a.lng
      	interface/web/dns/lib/lang/de_dns_a_list.lng
      	interface/web/dns/lib/lang/de_dns_aaaa.lng
      	interface/web/dns/lib/lang/de_dns_alias.lng
      	interface/web/dns/lib/lang/de_dns_cname.lng
      	interface/web/dns/lib/lang/de_dns_hinfo.lng
      	interface/web/dns/lib/lang/de_dns_import.lng
      	interface/web/dns/lib/lang/de_dns_mx.lng
      	interface/web/dns/lib/lang/de_dns_ns.lng
      	interface/web/dns/lib/lang/de_dns_ptr.lng
      	interface/web/dns/lib/lang/de_dns_rp.lng
      	interface/web/dns/lib/lang/de_dns_slave.lng
      	interface/web/dns/lib/lang/de_dns_slave_list.lng
      	interface/web/dns/lib/lang/de_dns_soa.lng
      	interface/web/dns/lib/lang/de_dns_soa_list.lng
      	interface/web/dns/lib/lang/de_dns_srv.lng
      	interface/web/dns/lib/lang/de_dns_template.lng
      	interface/web/dns/lib/lang/de_dns_template_list.lng
      	interface/web/dns/lib/lang/de_dns_txt.lng
      	interface/web/help/lib/lang/de.lng
      	interface/web/help/lib/lang/de_faq_form.lng
      	interface/web/help/lib/lang/de_faq_manage_questions_list.lng
      	interface/web/help/lib/lang/de_faq_sections_form.lng
      	interface/web/help/lib/lang/de_help_faq_list.lng
      	interface/web/help/lib/lang/de_help_faq_sections_list.lng
      	interface/web/help/lib/lang/de_support_message.lng
      	interface/web/help/lib/lang/de_support_message_list.lng
      	interface/web/login/lib/lang/de.lng
      	interface/web/mail/lib/lang/de.lng
      	interface/web/mail/lib/lang/de_mail_alias.lng
      	interface/web/mail/lib/lang/de_mail_alias_list.lng
      	interface/web/mail/lib/lang/de_mail_aliasdomain.lng
      	interface/web/mail/lib/lang/de_mail_aliasdomain_list.lng
      	interface/web/mail/lib/lang/de_mail_blacklist.lng
      	interface/web/mail/lib/lang/de_mail_blacklist_list.lng
      	interface/web/mail/lib/lang/de_mail_content_filter.lng
      	interface/web/mail/lib/lang/de_mail_content_filter_list.lng
      	interface/web/mail/lib/lang/de_mail_domain.lng
      	interface/web/mail/lib/lang/de_mail_domain_admin_list.lng
      	interface/web/mail/lib/lang/de_mail_domain_catchall.lng
      	interface/web/mail/lib/lang/de_mail_domain_catchall_list.lng
      	interface/web/mail/lib/lang/de_mail_domain_list.lng
      	interface/web/mail/lib/lang/de_mail_forward.lng
      	interface/web/mail/lib/lang/de_mail_forward_list.lng
      	interface/web/mail/lib/lang/de_mail_get.lng
      	interface/web/mail/lib/lang/de_mail_get_list.lng
      	interface/web/mail/lib/lang/de_mail_mailinglist.lng
      	interface/web/mail/lib/lang/de_mail_mailinglist_list.lng
      	interface/web/mail/lib/lang/de_mail_relay_recipient.lng
      	interface/web/mail/lib/lang/de_mail_relay_recipient_list.lng
      	interface/web/mail/lib/lang/de_mail_spamfilter.lng
      	interface/web/mail/lib/lang/de_mail_spamfilter_list.lng
      	interface/web/mail/lib/lang/de_mail_transport.lng
      	interface/web/mail/lib/lang/de_mail_transport_list.lng
      	interface/web/mail/lib/lang/de_mail_user.lng
      	interface/web/mail/lib/lang/de_mail_user_filter.lng
      	interface/web/mail/lib/lang/de_mail_user_filter_list.lng
      	interface/web/mail/lib/lang/de_mail_user_list.lng
      	interface/web/mail/lib/lang/de_mail_user_stats_list.lng
      	interface/web/mail/lib/lang/de_mail_whitelist.lng
      	interface/web/mail/lib/lang/de_mail_whitelist_list.lng
      	interface/web/mail/lib/lang/de_spamfilter_blacklist.lng
      	interface/web/mail/lib/lang/de_spamfilter_blacklist_list.lng
      	interface/web/mail/lib/lang/de_spamfilter_config.lng
      	interface/web/mail/lib/lang/de_spamfilter_config_list.lng
      	interface/web/mail/lib/lang/de_spamfilter_policy.lng
      	interface/web/mail/lib/lang/de_spamfilter_policy_list.lng
      	interface/web/mail/lib/lang/de_spamfilter_users.lng
      	interface/web/mail/lib/lang/de_spamfilter_users_list.lng
      	interface/web/mail/lib/lang/de_spamfilter_whitelist.lng
      	interface/web/mail/lib/lang/de_spamfilter_whitelist_list.lng
      	interface/web/mail/lib/lang/de_user_quota_stats_list.lng
      	interface/web/mailuser/lib/lang/de.lng
      	interface/web/mailuser/lib/lang/de_index.lng
      	interface/web/mailuser/lib/lang/de_mail_user_autoresponder.lng
      	interface/web/mailuser/lib/lang/de_mail_user_cc.lng
      	interface/web/mailuser/lib/lang/de_mail_user_filter.lng
      	interface/web/mailuser/lib/lang/de_mail_user_filter_list.lng
      	interface/web/mailuser/lib/lang/de_mail_user_password.lng
      	interface/web/mailuser/lib/lang/de_mail_user_spamfilter.lng
      	interface/web/monitor/lib/lang/de.lng
      	interface/web/monitor/lib/lang/de_datalog_list.lng
      	interface/web/sites/aps_installedpackages_list.php
      	interface/web/sites/lib/lang/de.lng
      	interface/web/sites/lib/lang/de_aps.lng
      	interface/web/sites/lib/lang/de_aps_instances_list.lng
      	interface/web/sites/lib/lang/de_aps_packages_list.lng
      	interface/web/sites/lib/lang/de_aps_update_packagelist.lng
      	interface/web/sites/lib/lang/de_cron.lng
      	interface/web/sites/lib/lang/de_cron_list.lng
      	interface/web/sites/lib/lang/de_database.lng
      	interface/web/sites/lib/lang/de_database_admin_list.lng
      	interface/web/sites/lib/lang/de_database_list.lng
      	interface/web/sites/lib/lang/de_database_user.lng
      	interface/web/sites/lib/lang/de_database_user_admin_list.lng
      	interface/web/sites/lib/lang/de_database_user_list.lng
      	interface/web/sites/lib/lang/de_ftp_user.lng
      	interface/web/sites/lib/lang/de_ftp_user_list.lng
      	interface/web/sites/lib/lang/de_shell_user.lng
      	interface/web/sites/lib/lang/de_shell_user_list.lng
      	interface/web/sites/lib/lang/de_user_quota_stats_list.lng
      	interface/web/sites/lib/lang/de_web_aliasdomain.lng
      	interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
      	interface/web/sites/lib/lang/de_web_backup_list.lng
      	interface/web/sites/lib/lang/de_web_domain.lng
      	interface/web/sites/lib/lang/de_web_domain_admin_list.lng
      	interface/web/sites/lib/lang/de_web_domain_list.lng
      	interface/web/sites/lib/lang/de_web_folder.lng
      	interface/web/sites/lib/lang/de_web_folder_list.lng
      	interface/web/sites/lib/lang/de_web_folder_user.lng
      	interface/web/sites/lib/lang/de_web_folder_user_list.lng
      	interface/web/sites/lib/lang/de_web_sites_stats_list.lng
      	interface/web/sites/lib/lang/de_web_subdomain.lng
      	interface/web/sites/lib/lang/de_web_subdomain_list.lng
      	interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng
      	interface/web/sites/lib/lang/de_webdav_user.lng
      	interface/web/sites/lib/lang/de_webdav_user_list.lng
      	interface/web/sites/templates/aps_install_package.htm
      	interface/web/strengthmeter/lib/lang/de_strengthmeter.lng
      	interface/web/themes/default/css/styles.css
      	interface/web/tools/lib/lang/de.lng
      	interface/web/tools/lib/lang/de_import_ispconfig.lng
      	interface/web/tools/lib/lang/de_index.lng
      	interface/web/tools/lib/lang/de_interface.lng
      	interface/web/tools/lib/lang/de_resync.lng
      	interface/web/tools/lib/lang/de_tpl_default.lng
      	interface/web/tools/lib/lang/de_usersettings.lng
      	interface/web/vm/lib/lang/de.lng
      	interface/web/vm/lib/lang/de_openvz_action.lng
      	interface/web/vm/lib/lang/de_openvz_ip.lng
      	interface/web/vm/lib/lang/de_openvz_ip_list.lng
      	interface/web/vm/lib/lang/de_openvz_ostemplate.lng
      	interface/web/vm/lib/lang/de_openvz_ostemplate_list.lng
      	interface/web/vm/lib/lang/de_openvz_template.lng
      	interface/web/vm/lib/lang/de_openvz_template_list.lng
      	interface/web/vm/lib/lang/de_openvz_vm.lng
      	interface/web/vm/lib/lang/de_openvz_vm_list.lng
      	server/cron_daily.php
      	server/lib/classes/aps_installer.inc.php
      	server/mods-available/rescue_core_module.inc.php
      7cf3e980
    • Marius Cramer's avatar
      Fixed list sorting · 7d52e00a
      Marius Cramer authored
      7d52e00a
    • Marius Cramer's avatar
  2. Nov 03, 2013
  3. Nov 01, 2013
  4. Oct 30, 2013
  5. Oct 29, 2013
  6. Oct 25, 2013
  7. Oct 23, 2013
  8. Oct 22, 2013
  9. Oct 21, 2013
  10. Oct 18, 2013
  11. Oct 17, 2013
    • Florian Schaal's avatar
      DKIM-Modifications · b9ea02ce
      Florian Schaal authored
      skip writing dkim-values for inactive domains
      removed the public-dkim-key from the interface
      added german language-file
      b9ea02ce
  12. Oct 16, 2013
  13. Oct 15, 2013
  14. Oct 14, 2013