Skip to content
  1. Oct 28, 2014
  2. Oct 24, 2014
  3. Oct 23, 2014
    • Till Brehm's avatar
      67fedede
    • Till Brehm's avatar
      Improved Centos 7 support in installer. · ccebb930
      Till Brehm authored
      ccebb930
    • Marius Cramer's avatar
      Merge branch 'stable-3.0.5' · 7972151d
      Marius Cramer authored
      Conflicts:
      	install/autoupdate.php
      	install/install.php
      	install/sql/incremental/upd_0078.sql
      	install/sql/ispconfig3.sql
      	install/tpl/config.inc.php.master
      	install/tpl/debian_postfix.conf.master
      	install/tpl/fedora_postfix.conf.master
      	install/tpl/gentoo_postfix.conf.master
      	install/tpl/opensuse_postfix.conf.master
      	interface/lib/classes/db_mysql.inc.php
      	interface/lib/classes/remoting.inc.php
      	interface/lib/classes/tform.inc.php
      	interface/lib/classes/validate_reseller.inc.php
      	interface/lib/config.inc.php
      	interface/lib/lang/es.lng
      	interface/web/admin/lib/lang/de_server_config.lng
      	interface/web/admin/lib/lang/en_server_config.lng
      	interface/web/admin/lib/lang/es_server_config.lng
      	interface/web/admin/lib/lang/fr_server_config.lng
      	interface/web/admin/lib/lang/hr_server_config.lng
      	interface/web/dns/lib/lang/hr_dns_wizard.lng
      	interface/web/mail/lib/lang/hr_mail_user.lng
      	interface/web/mail/mail_domain_edit.php
      	interface/web/mail/mail_user_edit.php
      	interface/web/remote/index.php
      	interface/web/sites/database_edit.php
      	interface/web/sites/form/database.tform.php
      	interface/web/sites/form/web_vhost_subdomain.tform.php
      	interface/web/sites/lib/lang/ar_web_childdomain_list.lng
      	interface/web/sites/lib/lang/ar_web_vhost_domain_list.lng
      	interface/web/sites/lib/lang/cz_web_childdomain.lng
      	interface/web/sites/lib/lang/cz_web_subdomain.lng
      	interface/web/sites/lib/lang/cz_web_subdomain_list.lng
      	interface/web/sites/lib/lang/cz_web_vhost_domain.lng
      	interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
      	interface/web/sites/lib/lang/de_ftp_user.lng
      	interface/web/sites/lib/lang/de_shell_user.lng
      	interface/web/sites/lib/lang/en_ftp_user.lng
      	interface/web/sites/lib/lang/en_web_childdomain.lng
      	interface/web/sites/lib/lang/en_web_domain.lng
      	interface/web/sites/lib/lang/es_ftp_user.lng
      	interface/web/sites/lib/lang/es_shell_user.lng
      	interface/web/sites/lib/lang/es_web_domain.lng
      	interface/web/sites/lib/lang/fr_web_subdomain.lng
      	interface/web/sites/lib/lang/hr_web_aliasdomain.lng
      	interface/web/sites/lib/lang/hr_web_subdomain.lng
      	interface/web/sites/lib/lang/hr_web_subdomain_list.lng
      	interface/web/sites/lib/lang/hr_web_vhost_domain.lng
      	interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
      	interface/web/sites/lib/lang/se_web_subdomain.lng
      	interface/web/sites/lib/lang/se_web_subdomain_list.lng
      	interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
      	interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
      	interface/web/sites/web_aliasdomain_edit.php
      	interface/web/sites/web_domain_edit.php
      	interface/web/sites/web_vhost_subdomain_edit.php
      	interface/web/themes/blue/ispconfig_version
      	interface/web/themes/default-304/templates/admin/server_config_mail_edit.htm
      	interface/web/themes/default-304/templates/admin/system_config_sites_edit.htm
      	interface/web/themes/default-304/templates/dns/dns_wizard.htm
      	interface/web/themes/default-304/templates/mail/spamfilter_config_mail_edit.htm
      	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_advanced.htm
      	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_backup.htm
      	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_redirect.htm
      	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_ssl.htm
      	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_stats.htm
      	server/conf/vhost.conf.master
      	server/cron_daily.php
      	server/lib/classes/db_mysql.inc.php
      	server/mods-available/monitor_core_module.inc.php
      7972151d
    • Florian Schaal's avatar
      dkim: fixed issue with php 5.3 · 6faa009f
      Florian Schaal authored
      6faa009f
  4. Oct 19, 2014
  5. Oct 18, 2014
  6. Oct 17, 2014
  7. Oct 16, 2014
  8. Oct 14, 2014
  9. Oct 13, 2014
    • Dominik Müller's avatar
      And additional in dist-files · a8aad2c0
      Dominik Müller authored
      a8aad2c0
    • Dominik Müller's avatar
      59baa48e
    • Marius Cramer's avatar
      Merge branch 'master' into 'master' · 559b657f
      Marius Cramer authored
      Master
      
      Hello Marius,
      
      just re-did it again and committed only files i changed.
      Should be fine now. :-)
      
      Jochen
      
      See merge request !126
      559b657f
    • Jochen's avatar
      delete gitignore · 7a424876
      Jochen authored
      7a424876
    • Marius Cramer's avatar
      Merge branch 'master_fixes' into 'master' · 43418672
      Marius Cramer authored
      Use LMTP only if necessary
      
      Defaultvalues for virtual_transport switched back to maildrop like in 3.0.5.x. If dovecot is used, configure_dovcot switches to dovecot also like in 3.0.5.x. lmtp is only used in future if Uid-Mapping is enabled -> therefor it is necessary. Switching is implemented in server-postfix-plugin.
      Validate Mail/Webuser-UID-Mapping: only enable, when Single-Server-Setup. Switching only possible unless a user was created.
      
      Reason for this change: Few months ago a feature for mapping web-user-linux-uid to mail-user was added to sum up disk quota over webspace and mailusage. This feature required switching mail-delivery virtual_transport from maildrop or dovecot to lmtp. LMTP has one big disadvantage: X-Original-header will get lost when deliver a BCC-mail to a mailbox.
      Additional this feature only works if mail and web-files lay on the same server. and if changing this value, directory-permissions would be necessary to change, so it will only be possible if there is NO mail user created yet.
      
      See merge request !128
      43418672
  10. Oct 12, 2014
  11. Oct 11, 2014
  12. Oct 10, 2014
  13. Oct 09, 2014