Commits · master · Romain / ISPConfig 3

20 Feb, 2014 1 commit
- Merge branch 'master' into 'master' · 18b51953
  Marius Cramer authored Feb 20, 2014
```
Master
```
  18b51953
18 Feb, 2014 20 commits
- Revert "add domain and username to db-size-monitoring" · e0f619c9
  Florian Schaal authored Feb 18, 2014
```
This reverts commit b125fabc.
```
  e0f619c9
- Revert "remove sys_groupid from output" · 083cdf0a
  Florian Schaal authored Feb 18, 2014
```
This reverts commit bc1e70a3.
```
  083cdf0a
- Revert "added username to make the monitor-data usable for db-quota-checks" · e9b9fd81
  Florian Schaal authored Feb 18, 2014
```
This reverts commit 85851254.
```
  e9b9fd81
- Revert "fixed AUTHSQL" · 83bedf70
  Florian Schaal authored Feb 18, 2014
```
This reverts commit 366decb5.
```
  83bedf70
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · 1e780578
  Florian Schaal authored Feb 18, 2014
  
  1e780578
- Missed conflict resolved from merge · 030bb96e
  Marius Cramer authored Feb 18, 2014
  
  030bb96e
- Merge remote-tracking branch 'origin/stable-3.0.5' · 8ddcb0d7
  Marius Cramer authored Feb 18, 2014
```
Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/sites/web_vhost_subdomain_edit.php
	server/plugins-available/cron_plugin.inc.php
```
  8ddcb0d7
- Implemented: FS#3010 - Remove mount --bind lines from df output in monitor · 05481a4f
  Marius Cramer authored Feb 18, 2014
  
  05481a4f
- Cron log should always be rotated, not depending on size · b41dfdd6
  Marius Cramer authored Feb 18, 2014
  
  b41dfdd6
- Added cron log rotation and compression · da0a8173
  Marius Cramer authored Feb 18, 2014
  
  da0a8173
- Path extension for non jailed cronjbs not working. · c9262595
  Till Brehm authored Feb 18, 2014
  
  c9262595
- Corrected bug in cron job logging and added wget output log (only of last job) · b26653b9
  Marius Cramer authored Feb 18, 2014
  
  b26653b9
- Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 · 10b13b85
  Till Brehm authored Feb 18, 2014
  
  10b13b85
- Removed code line from previous commit · d58816c0
  Marius Cramer authored Feb 18, 2014
  
  d58816c0
- Copied new sql definitions from master · 7b699b69
  Marius Cramer authored Feb 18, 2014
  
  7b699b69
- Implemented: FS#3347 - Add output logging of cronjobs · 46236c96
  Marius Cramer authored Feb 18, 2014
  
  46236c96
- Implemented: FS#3346 - Add a [web_root] placeholder to cronjob command · 0a02ee3d
  Marius Cramer authored Feb 18, 2014
  
  0a02ee3d
- remove sys_groupid from output · bc1e70a3
  Florian Schaal authored Feb 18, 2014
  
  bc1e70a3
- added username to make the monitor-data usable for db-quota-checks · 85851254
  Florian Schaal authored Feb 18, 2014
  
  85851254
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · 35a68db6
  Florian Schaal authored Feb 18, 2014
  
  35a68db6
17 Feb, 2014 17 commits
- Added missing server remoting functions from stable branch · 41add69c
  Marius Cramer authored Feb 17, 2014
  
  41add69c
- Fixed bug in server_get remoting function · f266c309
  Marius Cramer authored Feb 17, 2014
  
  f266c309
- Fixed: FS#3342 - Domain Modul: Neue generische Top Level Domains können nicht angelegt werden · 1af70cf1
  Till Brehm authored Feb 17, 2014
  
  1af70cf1
- Fixed problem with AUTHSQL placeholder in tform · cce3c1b5
  Marius Cramer authored Feb 17, 2014
  
  cce3c1b5
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · 5bd2aa25
  Florian Schaal authored Feb 17, 2014
  
  5bd2aa25
- Changed Options directives to be compatible with apache 2.4 · 5545f186
  Marius Cramer authored Feb 17, 2014
  
  5545f186
- Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 · d69cca1c
  Marius Cramer authored Feb 17, 2014
  
  d69cca1c
- Changed sql queries · 758d3205
  Marius Cramer authored Feb 17, 2014
  
  758d3205
- Merge remote-tracking branch 'origin/stable-3.0.5' · ebbe6374
  Marius Cramer authored Feb 17, 2014
```
Conflicts:
	install/tpl/debian_postfix.conf.master
	install/tpl/fedora_postfix.conf.master
	install/tpl/gentoo_postfix.conf.master
	install/tpl/opensuse_postfix.conf.master
	install/uninstall.php
	interface/lib/classes/remoting_lib.inc.php
	interface/lib/classes/tform.inc.php
	interface/web/mail/lib/lang/de_mail_user.lng
	interface/web/mailuser/lib/lang/de_mail_user_cc.lng
	interface/web/sites/aps_install_package.php
	interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
	interface/web/sites/web_vhost_domain_edit.php
	interface/web/sites/web_vhost_subdomain_edit.php
	server/cron_daily.php
	server/lib/classes/monitor_tools.inc.php
```
  ebbe6374
- Fixed vhostsubdomain not empty regex check to allow 1 char subdomains. · baa7f273
  Till Brehm authored Feb 17, 2014
  
  baa7f273
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · 1f1d5667
  Florian Schaal authored Feb 17, 2014
  
  1f1d5667
- updated lng-files · 41d35acd
  Florian Schaal authored Feb 17, 2014
  
  41d35acd
- add domain and username to db-size-monitoring · b125fabc
  Florian Schaal authored Feb 17, 2014
  
  b125fabc
- Fixed: FS#3192 - Disabled select fields show up as active when combobox function is enabled. · ce1c6d84
  Till Brehm authored Feb 17, 2014
  
  ce1c6d84
- Merge branch 'master' into 'master' · 441afe55
  Marius Cramer authored Feb 17, 2014
```
Master
```
  441afe55
- Fixed: FS#2962 - APS package update misses latest Joomla version · 54d0813b
  Till Brehm authored Feb 17, 2014
  
  54d0813b
- fixed AUTHSQL · 366decb5
  Florian Schaal authored Feb 17, 2014
  
  366decb5
16 Feb, 2014 2 commits
- Fixed: FS#3340 - APS permissions bug · 3225c76f
  Till Brehm authored Feb 16, 2014
  
  3225c76f
- added new cron-sheduler to install and fixed server/cron.sh · 0e963f7a
  Florian Schaal authored Feb 16, 2014
  
  0e963f7a