Commits · 69f5c9ad8749cd9b72270bdfea1cf1186a81067c · Helmo / ISPConfig 3

Mar 31, 2014
- add user-defined dkim-selector · 69f5c9ad
  Florian Schaal authored 10 years ago
  
  69f5c9ad
Mar 29, 2014
- Merge branch 'master' into 'master' · 85e29ab6
  Marius Cramer authored 10 years ago
  
  Master
  85e29ab6
Mar 28, 2014
- Use 60-dkim for the key-definitions on systems with seperated amavisd-configs... · e52d51c8
  Florian Schaal authored 10 years ago
  
  Use 60-dkim for the key-definitions on systems with seperated amavisd-configs like debian and ubuntu
  e52d51c8
- Merge branch 'master' into 'master' · 5555bbc1
  Marius Cramer authored 10 years ago
  
  Master
  5555bbc1
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · 09c2227c
  Florian Schaal authored 10 years ago
  
  09c2227c
- Use preg_match/preg_replace when adding/removing keys to amavis to avoid... · 7805e19e
  Florian Schaal authored 10 years ago
  
  Use preg_match/preg_replace when adding/removing keys to amavis to avoid duplicate keys with different selectors. Prevent restarting amavis more then one time.
  7805e19e
Mar 27, 2014

Merge branch 'master' into 'master' · d14f0141

Marius Cramer authored 10 years ago

Master

This will enable all functions, if previously disabled in php.ini, like exec which ispconfig needs to functions properly.

d14f0141

This will enable all functions, previously disabled in php.ini, like exec... · ee6dde66
Nedim Hadzimahmutovic authored 10 years ago
```
This will enable all functions, previously disabled in php.ini, like exec which ispconfig needs to functions properly.
```
ee6dde66

Mar 26, 2014
- Merge branch 'master_fixes' into 'master' · deb3716e
  Till Brehm authored 10 years ago
  
  Master Fixes Added backup-functions to remote-API (FS#2832)
  deb3716e
Mar 25, 2014
- Merge branch 'master' into 'master' · f2851d17
  Marius Cramer authored 10 years ago
  
  Bad french translation on SSL page State was translated country
  f2851d17
Mar 24, 2014
- added backup-functions to Remote-API (FS#2832) · 5f0a37ff
  Dominik authored 10 years ago
  
  5f0a37ff
Mar 21, 2014

Merge branch 'master_fixes' into 'master' · 1a20437c

Marius Cramer authored 11 years ago

Master Fixes

problem with ServerAlias-Directives solved with usage of vhostalias and subdomainalias

1a20437c

Mar 20, 2014

deleted existing_db again · 5cc962ca
Dominik authored 11 years ago

5cc962ca
Solved problem with vhost subs and aliases with ServerAlias-Command · 3c8b817a
Dominik authored 11 years ago

3c8b817a
merge master · 0a95e95d
Dominik authored 11 years ago

0a95e95d

Merge remote-tracking branch 'origin/stable-3.0.5' · 0832c839

Marius Cramer authored 11 years ago

Conflicts:
	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/config.inc.php
	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_subdomain_list.lng
	interface/web/themes/blue/ispconfig_version

0832c839

Mar 19, 2014
- Fixed server_id filter in mail domain list. · 9cb6fe13
  Till Brehm authored 11 years ago
  
  9cb6fe13
- Fixed warning message on openSuse due to apache2 module check · 0a0ca4f6
  Marius Cramer authored 11 years ago
  
  View commits for tag 3.0.5.4b1 3.0.5.4b1
  
  0a0ca4f6
Mar 18, 2014
- Enabled TLS for outgoing postfix smtp connections · 922807a9
  Marius Cramer authored 11 years ago
  
  922807a9
- - Display server name next to domain name in website quota list. · 79edeeb1
  Falko Timme authored 11 years ago
  
  79edeeb1
- State <> Country · 29798121
  doekia authored 11 years ago
  
  29798121
- State <> Country · 2c09b2d5
  doekia authored 11 years ago
  
  2c09b2d5
Mar 17, 2014
- Updated Czech language files. · 49887bc8
  Till Brehm authored 11 years ago
  
  49887bc8
Mar 13, 2014

Changed version number for blue theme. · 521d36e1
Till Brehm authored 11 years ago

521d36e1
Changed version number for beta release to 3.0.5.4b1 · 7dcd7208
Till Brehm authored 11 years ago

7dcd7208
Fix for last commit. · d10d15da
Till Brehm authored 11 years ago

d10d15da
Fixed a issue with apache 2.4 support on Ubuntu 13.10 · 39e5f011
Till Brehm authored 11 years ago

39e5f011
Removed obsolete files merged from stable · 773b716e
Marius Cramer authored 11 years ago

773b716e

Merge remote-tracking branch 'origin/stable-3.0.5' · 7c2179f4

Marius Cramer authored 11 years ago

Conflicts:
	interface/lib/lang/de.lng
	interface/web/admin/lib/lang/ar_server_config.lng
	interface/web/admin/lib/lang/bg_server_config.lng
	interface/web/admin/lib/lang/br_server_config.lng
	interface/web/admin/lib/lang/cz_server_config.lng
	interface/web/admin/lib/lang/de_server_config.lng
	interface/web/admin/lib/lang/de_software_package.lng
	interface/web/admin/lib/lang/de_software_repo.lng
	interface/web/admin/lib/lang/de_system_config.lng
	interface/web/admin/lib/lang/de_users.lng
	interface/web/admin/lib/lang/en_server_config.lng
	interface/web/admin/lib/lang/es_server_config.lng
	interface/web/admin/lib/lang/fi_server_config.lng
	interface/web/admin/lib/lang/fr_server_config.lng
	interface/web/admin/lib/lang/hr_server_config.lng
	interface/web/admin/lib/lang/hu_server_config.lng
	interface/web/admin/lib/lang/id_server_config.lng
	interface/web/admin/lib/lang/it_server_config.lng
	interface/web/admin/lib/lang/ja_server_config.lng
	interface/web/admin/lib/lang/nl_server_config.lng
	interface/web/admin/lib/lang/pl_server_config.lng
	interface/web/admin/lib/lang/pt_server_config.lng
	interface/web/admin/lib/lang/ro_server_config.lng
	interface/web/admin/lib/lang/ru_server_config.lng
	interface/web/admin/lib/lang/se_server_config.lng
	interface/web/admin/lib/lang/sk_server_config.lng
	interface/web/admin/lib/lang/tr_server_config.lng
	interface/web/client/lib/lang/de_client.lng
	interface/web/client/lib/lang/de_client_template.lng
	interface/web/client/lib/lang/de_reseller.lng
	interface/web/client/lib/lang/fr_client.lng
	interface/web/client/lib/lang/fr_reseller.lng
	interface/web/dns/lib/lang/cz_dns_dkim.lng
	interface/web/dns/lib/lang/de_dns_a.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_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_soa.lng
	interface/web/dns/lib/lang/de_dns_srv.lng
	interface/web/dns/lib/lang/de_dns_txt.lng
	interface/web/login/lib/lang/de.lng
	interface/web/mail/lib/lang/ar_mail_user.lng
	interface/web/mail/lib/lang/cz_mail_backup_list.lng
	interface/web/mail/lib/lang/de_mail_get.lng
	interface/web/mail/lib/lang/es_mail_user.lng
	interface/web/mail/lib/lang/fi_mail_user.lng
	interface/web/mail/lib/lang/fr_mail_user.lng
	interface/web/mail/lib/lang/hr_mail_user.lng
	interface/web/mail/lib/lang/hu_mail_user.lng
	interface/web/mail/lib/lang/id_mail_user.lng
	interface/web/mail/lib/lang/it_mail_user.lng
	interface/web/mail/lib/lang/ja_mail_user.lng
	interface/web/mail/lib/lang/nl_mail_user.lng
	interface/web/mail/lib/lang/pl_mail_user.lng
	interface/web/mail/lib/lang/pt_mail_user.lng
	interface/web/mail/lib/lang/ro_mail_user.lng
	interface/web/mail/lib/lang/ru_mail_user.lng
	interface/web/mail/lib/lang/se_mail_user.lng
	interface/web/mail/lib/lang/sk_mail_user.lng
	interface/web/mail/lib/lang/tr_mail_user.lng
	interface/web/monitor/lib/lang/de.lng
	interface/web/sites/form/web_vhost_subdomain.tform.php
	interface/web/sites/lib/lang/ar_web_vhost_domain.lng
	interface/web/sites/lib/lang/bg_web_vhost_domain.lng
	interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/br_web_vhost_domain.lng
	interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/cz_web_aliasdomain.lng
	interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
	interface/web/sites/lib/lang/cz_web_childdomain.lng
	interface/web/sites/lib/lang/cz_web_childdomain_list.lng
	interface/web/sites/lib/lang/cz_web_domain.lng
	interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
	interface/web/sites/lib/lang/cz_web_domain_list.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_domain_list.lng
	interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
	interface/web/sites/lib/lang/de_cron.lng
	interface/web/sites/lib/lang/de_shell_user.lng
	interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
	interface/web/sites/lib/lang/de_web_childdomain.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_domain_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/el_web_vhost_domain.lng
	interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/en_web_vhost_domain.lng
	interface/web/sites/lib/lang/es_web_vhost_domain.lng
	interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/fi_web_vhost_domain.lng
	interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/fr_web_vhost_domain.lng
	interface/web/sites/lib/lang/fr_web_vhost_subdomain.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/hu_web_vhost_domain.lng
	interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/id_web_vhost_domain.lng
	interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/it_web_vhost_domain.lng
	interface/web/sites/lib/lang/it_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/ja_web_vhost_domain.lng
	interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/nl_web_vhost_domain.lng
	interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/pl_web_vhost_domain.lng
	interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/pt_web_vhost_domain.lng
	interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/ro_web_vhost_domain.lng
	interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/ru_web_vhost_domain.lng
	interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/se_web_vhost_domain.lng
	interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/sk_web_vhost_domain.lng
	interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/tr_web_vhost_domain.lng
	interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng
	server/mods-available/monitor_core_module.inc.php

7c2179f4

Merge branch 'master' into 'master' · 478a6a0f
Marius Cramer authored 11 years ago
```
Master
```
478a6a0f
Merged language files. · dc9e64c6
Till Brehm authored 11 years ago

dc9e64c6
Implemented: FS#3235 - Allow 'any' value in zone xfer field · 3d3f986d
Till Brehm authored 11 years ago

3d3f986d
Create empty .htpasswd file, when adding a new folder protection. · 8433d033
Till Brehm authored 11 years ago

8433d033

Mar 12, 2014
- changed function check_free_space · 852a25f0
  Florian Schaal authored 11 years ago
  
  852a25f0
- FS#3370 - Duplicate directive NameVirtualHost in ispconfig.conf and ports.conf? · 14001d25
  Till Brehm authored 11 years ago
  
  14001d25
Mar 11, 2014
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · b769cc8e
  Florian Schaal authored 11 years ago
  
  b769cc8e
- add function to check the free space for a given directory · 6ff8d7bc
  Florian Schaal authored 11 years ago
  
  6ff8d7bc
- Split DNS TXT records in chunks of 255 chars in BIND configuration file. · 793c77a0
  Till Brehm authored 11 years ago
  
  793c77a0
- Set the min password length in password generator · e960e1d3
  Till Brehm authored 11 years ago
  
  e960e1d3
- Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 · 621f2702
  Till Brehm authored 11 years ago
  
  621f2702