- Nov 21, 2013
-
-
unknown authored
-
Marius Cramer authored
-
Marius Cramer authored
-
Florian Schaal authored
-
Florian Schaal authored
-
- Nov 20, 2013
-
-
Marius Cramer authored
-
Marius Cramer authored
-
Marius Cramer authored
-
Marius Cramer authored
Changed query syntax of alias domain edit file Changed deprecated syntax in alpha plesk importer
-
Marius Cramer authored
Conflicts: interface/lib/classes/tform.inc.php interface/web/admin/lib/lang/de_directive_snippets.lng interface/web/dns/dns_import.php interface/web/dns/dns_soa_edit.php interface/web/dns/dns_wizard.php interface/web/mail/mail_domain_edit.php interface/web/sites/database_edit.php interface/web/sites/lib/lang/de_web_domain.lng interface/web/sites/lib/lang/en_web_domain.lng interface/web/sites/web_domain_edit.php server/server.php
-
- Nov 19, 2013
-
-
Falko Timme authored
- nginx: added {DOCROOT} and {FASTCGIPASS} placeholders to directive snippets and nginx Directives fields.
-
Florian Schaal authored
display dns-record for dkim in the mail-domain rewrite function domain_dkim_update in server/plugins-available/mail_plugin_dkim.inc.php change dns*.php according to commit 604c0c24
-
Till Brehm authored
-
Till Brehm authored
-
Till Brehm authored
-
Falko Timme authored
-
Till Brehm authored
-
Marius Cramer authored
Fixed output of action name in debug mode (registerAction)
-
Till Brehm authored
-
- Nov 18, 2013
-
-
Till Brehm authored
-
Till Brehm authored
-
Till Brehm authored
-
Marius Cramer authored
Conflicts: interface/lib/classes/custom_datasource.inc.php interface/lib/classes/validate_client.inc.php interface/web/client/client_edit.php interface/web/dns/dns_soa_edit.php interface/web/dns/dns_wizard.php interface/web/mail/mail_domain_edit.php interface/web/sites/database_edit.php interface/web/sites/web_domain_edit.php
-
Sébastien JEAN authored
-
- Nov 14, 2013
-
-
Marius Cramer authored
Conflicts: install/dist/lib/fedora.lib.php install/dist/lib/gentoo.lib.php install/dist/lib/opensuse.lib.php install/install.php install/update.php interface/lib/classes/functions.inc.php interface/lib/classes/remoting.inc.php interface/lib/classes/remoting_lib.inc.php interface/lib/classes/tform.inc.php interface/lib/classes/tools_monitor.inc.php interface/web/admin/form/system_config.tform.php interface/web/dns/dns_wizard.php interface/web/dns/form/dns_template.tform.php interface/web/mail/form/mail_user.tform.php interface/web/monitor/lib/module.conf.php interface/web/monitor/show_data.php interface/web/remote/index.php interface/web/sites/database_user_edit.php interface/web/sites/form/database.tform.php interface/web/sites/form/database_user.tform.php interface/web/sites/list/database.list.php interface/web/sites/web_domain_edit.php interface/web/sites/web_vhost_subdomain_edit.php interface/web/tools/import_plesk.php server/cron_daily.php server/lib/classes/db_mysql.inc.php server/lib/classes/monitor_tools.inc.php server/mods-available/monitor_core_module.inc.php server/mods-available/rescue_core_module.inc.php server/plugins-available/apache2_plugin.inc.php server/plugins-available/backup_plugin.inc.php
-
Marius Cramer authored
-
Marius Cramer authored
-
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
-
Marius Cramer authored
-
Marius Cramer authored
-
- Nov 08, 2013
-
-
Sébastien JEAN authored
-
Sébastien JEAN authored
-
- Nov 03, 2013
-
-
Marius Cramer authored
-
- Nov 01, 2013
-
-
Florian Schaal authored
-
- Oct 30, 2013
-
-
Falko Timme authored
-
Falko Timme authored
-
Falko Timme authored
-
- Oct 29, 2013
-
-
Falko Timme authored
-
- Oct 25, 2013
-
-
Falko Timme authored
-
- Oct 23, 2013
-
-
Falko Timme authored
-