Commits · master · Matthias Wächter / ISPConfig 3

Mar 10, 2014
- 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 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
- Merge remote-tracking branch 'origin/stable-3.0.5' · 82b723df
  Marius Cramer authored Mar 06, 2014
```
Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/dns/lib/lang/cz_dns_dkim.lng
	interface/web/mail/lib/lang/cz_mail_backup_list.lng
	interface/web/mail/lib/lang/cz_mail_user.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_subdomain_list.lng
	interface/web/sites/lib/lang/cz_web_vhost_domain.lng
	interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
	interface/web/sites/web_vhost_domain_edit.php
```
  82b723df
- Moved check_recipient_access to the front. Blacklist for recipients is ignored... · a80ae199
  Marius Cramer authored Mar 06, 2014
```
Moved check_recipient_access to the front. Blacklist for recipients is ignored on outgoing mails via smtp auth otherwise.
```
  a80ae199
- Fixed syntax error in ispconfig_update.php · 1df8fddf
  Till Brehm authored Mar 06, 2014
  
  1df8fddf
- db-quota: add lng-files · 9bf0533a
  Florian Schaal authored Mar 06, 2014
  
  9bf0533a
- Merge branch 'master' into 'master' · 35b30fa7
  Marius Cramer authored Mar 06, 2014
```
Master
```
  35b30fa7
- Removed outdated installation instructions. · 18148bda
  Till Brehm authored Mar 06, 2014
  
  18148bda
- fixed typo in ispconfig_update.php · 623d691a
  Florian Schaal authored Mar 06, 2014
  
  623d691a
- database-quota: add stats to website-tab · b7d3b166
  Florian Schaal authored Mar 06, 2014
  
  b7d3b166
- fixed sql-syntax in database_edit.php · 1715c153
  Florian Schaal authored Mar 06, 2014
  
  1715c153
- Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 · 52983de5
  Falko Timme authored Mar 06, 2014
  
  52983de5
- - nginx: Increased fastcgi_read_timeout for phpMyAdmin in apps vhost to 1200 seconds. · aede496a
  Falko Timme authored Mar 06, 2014
  
  aede496a
Mar 05, 2014
- db-quota: changed sql-queries for dkim to new syntax · 323f1fc1
  Florian Schaal authored Mar 05, 2014
  
  323f1fc1
- mail-backup: Make sure backup_interval is a string, not an integer. · d9443da5
  Florian Schaal authored Mar 05, 2014
  
  d9443da5
- changed sql-queries for dkim to new syntax · 6c57e7f4
  Florian Schaal authored Mar 05, 2014
  
  6c57e7f4
- fixed type in databasq quota notifications · 1c58c1af
  Florian Schaal authored Mar 05, 2014
  
  1c58c1af
- Merge branch 'remote_quota' into 'master' · cd9e802b
  Marius Cramer authored Mar 05, 2014
```
Remote Quota

Added functions to get Website and Mail-Quota via Remote-Api
Moved Quota-Calculation-Functions to own lib-File for usage from dashlets and Remote-Api
Added Parameters to select if quota should be given readable (+kB, +MB) or as raw data (via remote)
```
  cd9e802b
- combined sql-queries · 78e231a6
  Dominik authored Mar 05, 2014
  
  78e231a6
- switched to new query syntax - do quoting where it is needed · b4547961
  Dominik authored Mar 05, 2014
  
  b4547961
- Changed Quota-Functions from sys_group to client_id · f1c4cdd6
  Dominik authored Mar 05, 2014
  
  f1c4cdd6
- - Improved IP address loop. · 3de838dd
  Till Brehm authored Mar 05, 2014
  
  3de838dd
- Added missing ip addess loop in ispconfig.conf · 8555470d
  Till Brehm authored Mar 05, 2014
  
  8555470d
Mar 04, 2014
- - Added templating library to installer. · ccbf1497
  Till Brehm authored Mar 04, 2014
```
- Added function to detect the apache version to installer.
- Added support for apache 2.4 to vhots templates for ispconfig vhost and apps vhost in installer.
```
  ccbf1497
- Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 · b846a278
  Till Brehm authored Mar 04, 2014
  
  b846a278
Mar 03, 2014
- Revert "- Remoting: added function to get all IP addresses of a server." · ed768786
  Falko Timme authored Mar 03, 2014
```
This reverts commit 4cd62d78.
```
  ed768786
- moved quota-functions to site and mail-file · c7e23161
  Dominik authored Mar 03, 2014
  
  c7e23161
Mar 02, 2014
- Moved quotafunctions to monitor.inc.php · 6eca510a
  Dominik authored Mar 02, 2014
  
  6eca510a
- - Remoting: added function to get all IP addresses of a server. · 4cd62d78
  Falko Timme authored Mar 02, 2014
  
  4cd62d78
Feb 28, 2014
- - Remoting: add correct values for database backup_intervals and backup_copies. · d677ffa6
  Falko Timme authored Feb 28, 2014
  
  d677ffa6
- - Databases: Make sure backup_interval is a string, not an integer. · 7c19f2db
  Falko Timme authored Feb 28, 2014
  
  7c19f2db
- - MySQL databases: backup_interval must be a string, not an integer. · ceab233d
  Falko Timme authored Feb 28, 2014
  
  ceab233d
- Fixed problem with new "multiple servers for clients" feature · 1aece9b8
  Marius Cramer authored Feb 28, 2014
  
  1aece9b8
Feb 27, 2014
- Merge remote-tracking branch 'origin/stable-3.0.5' · 361156e8
  Marius Cramer authored Feb 27, 2014
  
  361156e8
- Fixed SQL typos · 9e444eb6
  Marius Cramer authored Feb 27, 2014
  
  9e444eb6
Feb 26, 2014
- made readable diableable · 3eefd159
  Dominik authored Feb 26, 2014 and Dominik committed Feb 27, 2014
  
  3eefd159