Commits · 7c2179f4b8604da1167b29ffb92041cf16fc4dbc · Webslice / ISPConfig 3

Mar 13, 2014

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

Marius Cramer authored Mar 13, 2014

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 Mar 13, 2014
```
Master
```
478a6a0f
Merged language files. · dc9e64c6
Till Brehm authored Mar 13, 2014

dc9e64c6
Implemented: FS#3235 - Allow 'any' value in zone xfer field · 3d3f986d
Till Brehm authored Mar 13, 2014

3d3f986d
Create empty .htpasswd file, when adding a new folder protection. · 8433d033
Till Brehm authored Mar 13, 2014

8433d033

Mar 12, 2014
- changed function check_free_space · 852a25f0
  Florian Schaal authored Mar 12, 2014
  
  852a25f0
- FS#3370 - Duplicate directive NameVirtualHost in ispconfig.conf and ports.conf? · 14001d25
  Till Brehm authored Mar 12, 2014
  
  14001d25
Mar 11, 2014
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · b769cc8e
  Florian Schaal authored Mar 11, 2014
  
  b769cc8e
- add function to check the free space for a given directory · 6ff8d7bc
  Florian Schaal authored Mar 11, 2014
  
  6ff8d7bc
- Split DNS TXT records in chunks of 255 chars in BIND configuration file. · 793c77a0
  Till Brehm authored Mar 11, 2014
  
  793c77a0
- Set the min password length in password generator · e960e1d3
  Till Brehm authored Mar 11, 2014
  
  e960e1d3
- Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 · 621f2702
  Till Brehm authored Mar 11, 2014
  
  621f2702
- Implemented apache module check and mod_authz_compat warning for OpenSuSE · 60b70001
  Marius Cramer authored Mar 11, 2014
  
  60b70001
- Fixed path in ispconfig vhost in opensuse installer. · fbc02f27
  Till Brehm authored Mar 11, 2014
  
  fbc02f27
- Merge branch 'opensuse-srv-www' into 'master' · 11ca0c53
  Till Brehm authored Mar 11, 2014
```
Use /srv/www instead of /var/www for openSUSE

This functionality used to be there, but evidently got lost in this commit:
ccbf1497
```
  11ca0c53
- openSUSE uses /srv/www instead of /var/www · 8c963765
  Marc Schütz authored Mar 11, 2014
```
Therefore, replace the directories in the Apache config upon installation.

This functionality used to be there, but evidently got lost in this commit:
ccbf1497
```
  8c963765
- Fix for installer timezone detection (Marc Schütz) · 696af944
  Marius Cramer authored Mar 11, 2014
  
  696af944
- Merge branch 'fix-installer-timezone-detection' into 'master' · dc5aefbd
  Marius Cramer authored Mar 11, 2014
```
Fix Installer Timezone Detection

Fixes http://bugtracker.ispconfig.org/index.php?do=details&task_id=3389
```
  dc5aefbd
- Apache 2.4 fix from master (Marc Schütz) · 7ae7e8f7
  Marius Cramer authored Mar 11, 2014
  
  7ae7e8f7
- Merge branch 'apache24-fixes' into 'master' · 6fe5bbcf
  Marius Cramer authored Mar 11, 2014
```
Apache 2.4 fixes

The correct syntax is `Require all denied`, not `Require all deny`, see here:
http://httpd.apache.org/docs/2.4/upgrading.html
```
  6fe5bbcf
- Updated Czech language files. · e68b4013
  Till Brehm authored Mar 11, 2014
  
  e68b4013
- /etc/localtime can be a relative symlink · ff68e565
  Marc Schütz authored Mar 11, 2014
  
  ff68e565
Mar 10, 2014
- `denied` instead of `deny` in `Require all` · 61bf636a
  Marc Schütz authored Mar 10, 2014
  
  61bf636a
- Allow domains with long tld's like .photography for secondary dns zones. · 5488c061
  Till Brehm authored Mar 10, 2014
  
  5488c061
- Fixed: Password validator shall only check non-empty strings · c9974f2a
  Marius Cramer authored Mar 10, 2014
  
  c9974f2a
- Implemented: FS#3362 - Sort spamfilter policy's by name in mailbox and domain settings · ed1d29a4
  Marius Cramer authored Mar 10, 2014
  
  ed1d29a4
- Fixed: FS#3357 - Wrong SMTP HELO for Microsoft Exchange (ispcmail.inc.php) · 4dfacaa4
  Marius Cramer authored Mar 10, 2014
  
  4dfacaa4
- Added system option to configure minimum password strength and length · 7b938845
  Marius Cramer authored Mar 10, 2014
  
  7b938845
- Merge branch 'master' into 'master' · e4bc4a93
  Marius Cramer authored Mar 10, 2014
```
Vhostalias additions

added missing part for vhostalias in backup-cron
```
  e4bc4a93
Mar 09, 2014
- added missing part for vhostalias in cron-backup-script · 5efc46e1
  Dominik authored Mar 09, 2014
  
  5efc46e1
Mar 08, 2014
- - Fixed FS#3365 - Valid nginx rewrite rules are rejected with "Invalid Rewrite Rules" message · b5b6136d
  Falko Timme authored Mar 08, 2014
  
  b5b6136d
- - Fixed FS#3366 - Certain Custom php.ini settings seem to be stripped before... · 1d6097a2
  Falko Timme authored Mar 08, 2014
```
- Fixed FS#3366 - Certain Custom php.ini settings seem to be stripped before being saved to .conf file.
```
  1d6097a2
- Fixed: FS#3127 - Firewall not fully disabled when the rule set is removed in ispconfig · 006b572c
  Till Brehm authored Mar 08, 2014
  
  006b572c
- Fixed: FS#3188 - .ftpquota file remains · 4887d4e9
  Till Brehm authored Mar 08, 2014
  
  4887d4e9
- Fixed: FS#3302 - Hourly monitoring of system updates make system unusable · 82ff6299
  Till Brehm authored Mar 08, 2014
```
- Updated Linux Distribution detection to recognize all wheezy sub versions correctly.
```
  82ff6299
- Fixed: FS#3372 - Web browser password autofill function overwrites settings · 71c74b1b
  Till Brehm authored Mar 08, 2014
  
  71c74b1b
Mar 07, 2014
- Merge branch 'master' into 'master' · bed72531
  Marius Cramer authored Mar 07, 2014
```
Master
```
  bed72531
- DKIM: simplify the dkim-entry in a template · d73ce645
  Florian Schaal authored Mar 07, 2014
  
  d73ce645
- corrected do not change the order in smtpd_recipient_restrictions when updating RBLs · f0720ef4
  Florian Schaal authored Mar 07, 2014
  
  f0720ef4
Mar 06, 2014
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · 1838fd1c
  Florian Schaal authored Mar 06, 2014
  
  1838fd1c