ISPConfig 3:b1a6a5a3991cec5cd08873b01376e45d0b247f18 commitshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commits/b1a6a5a3991cec5cd08873b01376e45d0b247f182013-11-14T15:05:33+01:00https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b1a6a5a3991cec5cd08873b01376e45d0b247f18Cleaning up code to match coding guidelines2013-11-14T15:05:33+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7cf3e98090a3e9f0a9cc960d07c5f259adab6a19Merge remote-tracking branch 'origin/stable-3.0.5'2013-11-14T14:39:08+01:00Marius Cramerm.cramer@pixcept.de
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.phphttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7d52e00a51450bc4a080d4e21b7dda02c0a65191Fixed list sorting2013-11-14T11:42:06+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/202df8fed7b7f32b624480b6382154262e5facfbFixed sorting of quota columns (mail quota and web site quota)2013-11-14T11:04:08+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/78fc9a64bdd7fc1ac11c8718e097799236c0ba23Merge branch 'master' of /home/git/repositories/florian030/ispconfig32013-11-03T13:23:46+01:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/232684261dc25c783e3b456b91bf45766caa27beset database order in monitor2013-11-01T16:02:13+01:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/213e0bc6bc26a40cd8a29daf997a9c46b1f10ce1- Company ID can now have a length of up to 255 characters (instead of just 30).2013-10-30T13:36:43+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/eedc0531478ad21fa7e9fc2103f8436c7fbd9973- Allow umlauts (äöüÄÖÜ) in SSL certificates.2013-10-30T10:20:48+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1fef4a59728ae58e81ba3c640268b7d14e133299- Fixed FS#3203 - Choice of "Default Secondary DNS Server" broken.2013-10-30T01:19:03+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2c0812a625552379b85fefa69dfe2092d3fee06e- Allow & in SSL certificates (like in "MeineFirma GmbH & Co. KG").2013-10-29T18:49:04+01:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/dd13201d79955335a46b3b9af3405c3cb476f497- Updated language files.2013-10-25T20:34:05+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a0206f6e870bd32c4eb39e4da723655f8cd9f46c- Make sure a client cannot be deleted if he has records in the billing module.2013-10-23T16:19:24+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/22903acd6c8e21e08ac165e8a3be72c4f45ded60- Fixed FS#3123 - Old backups are still shown in backup list.2013-10-23T15:15:47+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2c76f1a2117f56a3f13452eaca05a5b4d5751a1b- Fixed FS#3118 - munin & monit logins not being urlencoded.2013-10-23T02:31:57+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0c072eb0b55d5c38bc3431348ddab22d3617321b- Fixed FS#3141 - Subdomains in website harddisk qouta box on dashboard.2013-10-23T02:15:48+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6ba4fa90f4f80de2206ef6163c54b1be5ef462f5- Fixed FS#3122 - Slave update asking for ISPConfig port.2013-10-22T19:43:19+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/391e05cbee6ff84bce60b665be60b4e5f049ee7f- Display hostname next to IP (where available) in the jQuery IP suggestion box.2013-10-22T18:48:51+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3327ed1941768a08e7891eb6c268fa3eeafd2320- Installer/updater: added checks if service is installed before it is restar...2013-10-22T17:58:07+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d5473beac0fb8fdd2b11be1f7fd286d2aaed1649- Display server name in all web domains select fields so that you know which...2013-10-22T15:58:40+02:00Falko Timmeft@falkotimme.com- Display server name in all web domains select fields so that you know which domain from which server you select.
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3bf002475c6a1c14b07e1c17a6b31ea90607099bMerge branch 'master' of /home/git/repositories/florian030/ispconfig32013-10-21T22:17:33+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7ed87c51103a7e988b0f0a2265805b698cf7e5b1fixed security issue2013-10-21T22:03:13+02:00Florian Schaalflorian@schaal-24.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e5685e737cb80ef9a5c3948ce9a96f58eb99413dMerge branch 'master' of /home/git/repositories/florian030/ispconfig32013-10-21T18:19:42+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/21c641cb28510fe775b2f11c17744d74e972b018add database-size monitoring. the results stored in the database may be used...2013-10-21T16:34:41+02:00Florian Schaalflorian@schaal-24.deadd database-size monitoring. the results stored in the database may be used to add the db-size to the web-quota, too.
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/acdd7a74df0850ac9c0671db71a1d040fc83bbba- $inst can be replaced by $this.2013-10-21T15:33:39+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8b3992261b8d6e57e539a2a8b7fe74bf21ffddbd- Forgot to make $inst global in function configure_pureftpd().2013-10-21T15:28:06+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/146783b0c7eaa828434f06d500abce07afbd1ea5Changed all windows line breaks to unix line breaks (coding guidelines!)2013-10-21T13:38:36+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bbc6570c197e0b660f4465ad3b1494451e03d4c9Converted all windows line breaks to unix line breaks (coding guidelines!)2013-10-21T13:36:38+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b533b414a075013307447a3fb895b1625504d477Merge remote-tracking branch 'florian030/master'2013-10-21T13:15:00+02:00Marius Cramerm.cramer@pixcept.de
Conflicts:
interface/lib/classes/validate_dkim.inc.php
interface/web/dns/dns_dkim_edit.php
interface/web/dns/dns_dkim_get.php
interface/web/dns/dns_wizard.php
interface/web/dns/form/dns_dkim.tform.php
interface/web/dns/lib/lang/en_dns_dkim.lng
interface/web/dns/templates/dns_dkim_edit.htm
interface/web/js/dns_dkim.js
interface/web/js/mail_domain_dkim.js
interface/web/mail/mail_domain_dkim_create.phphttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/33bcd0069e1c051def4253bd310eac619405b929- Added support for systemd and upstart (besides sysvinit).2013-10-21T11:41:19+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2d2fd172e1548dd24e1719accd0b856cff6a31a0- Added funtion to convert currency formatted numbers back to floating numbers.2013-10-18T18:20:13+02:00Falko Timmeft@falkotimme.com- Improved getSearchSQL() function so that users can use their native date format so search for dates in lists.https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/05beae43cfeb15ea89b984d36105dcdbdffd0975Resolved differences from svn merge to trunk and git master2013-10-18T15:16:34+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bd68aae78a5d696e4ccb9c0d267486c283a6d9d2Resolved differences from svn merge to trunk and git master2013-10-18T14:49:59+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/9b18966510771d9299e58c8922ece9df7dc90a81Readded missing dkim files lost on migration2013-10-18T08:34:20+02:00Marius Cramerm.cramer@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b9ea02ce477d17d44eedd94d6fed3199569a472dDKIM-Modifications2013-10-17T17:02:23+02:00Florianflorian@schaal-24.deskip writing dkim-values for inactive domains
removed the public-dkim-key from the interface
added german language-filehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/936c11949d425f39b8445fabc902ab6b0ace4aa2- Websites and Vhostsubdomains: When editing a web, show quota and traffic...2013-10-16T20:04:40+02:00Falko Timmeft@falkotimme.com- Websites and Vhostsubdomains: When editing a web, show quota and traffic errors to client/reseller only if he has changed those values; don't show errors for unchanged values.
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/aeb810f5d9ca64dfd7068956f942f06597173f0f- Added possibility to delete pre-defined locations with the "##delete##" str...2013-10-16T17:25:52+02:00Falko Timmeft@falkotimme.com
location ~ \.php$ { ##delete##
}
will delete the pre-defined
location ~ \.php$
location.https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7435fbc94faeabe12c41e53da251d4b5ac0e42cb- Corrected errors in German language files from SVN commit 4172.2013-10-15T18:09:02+02:00Falko Timmeft@falkotimme.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/081fbc674d2193a3062268142edc001d8ed97153Updated TODO.txt2013-10-15T10:07:27+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816Merge remote-tracking branch 'origin/stable-3.0.5'2013-10-14T16:04:06+02:00Marius Cramerm.cramer@pixcept.de
Conflicts:
install/lib/update.lib.php
install/sql/incremental/upd_0058.sql
install/tpl/server.ini.master
interface/lib/classes/remoting_lib.inc.php
interface/lib/classes/tform.inc.php
interface/web/admin/form/server_config.tform.php
interface/web/mail/templates/mail_domain_edit.htm
server/cron_daily.php
server/lib/classes/monitor_tools.inc.php
server/mods-available/monitor_core_module.inc.php
server/plugins-available/mail_plugin_dkim.inc.phphttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/992797f73c92b413a7fecff02c27c61b7db55b43Copied files from svn 3.0.5 stable branch (git migration)2013-10-14T15:54:49+02:00Marius Cramerm.cramer@pixcept.de