Commits · 361156e8395d3837a4cd0ff7a417d3ca8dc16a40 · Drew Clardy / ISPConfig 3

Feb 27, 2014
- Merge remote-tracking branch 'origin/stable-3.0.5' · 361156e8
  Marius Cramer authored 11 years ago
  
  361156e8
- Fixed SQL typos · 9e444eb6
  Marius Cramer authored 11 years ago
  
  9e444eb6
Feb 26, 2014

Merge branch 'master_fixes' into 'master' · bdc27bfe

Marius Cramer authored 11 years ago

Bugfix with Folder-Rights

Since chown and chgrp doesn't work recursively -> use parameters of mkdirpath instead

bdc27bfe

Feb 25, 2014
- Since chown and chgrp doesn't work recursively -> use parameters of mkdirpath instead · dbae22d2
  Dominik authored 11 years ago
  
  dbae22d2
- Merge branch 'stable-3.0.5' into 'master' · 230339ed
  Marius Cramer authored 11 years ago
  
  Stable 3.0.5
  230339ed
- Added country information · dca6af78
  Marius Cramer authored 11 years ago
  
  dca6af78
- Added sql incremental data from master · c87017c8
  Marius Cramer authored 11 years ago
  
  c87017c8
- Merge branch 'master' into 'master' · 0e3e3c99
  Marius Cramer authored 11 years ago
  
  Master
  0e3e3c99
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · cce9d632
  Florian Schaal authored 11 years ago
  
  cce9d632
- changes according to comments on merge-request · 5b3d2c2b
  Florian Schaal authored 11 years ago
  
  5b3d2c2b
- Merge remote-tracking branch 'origin/stable-3.0.5' · 3faab0ca
  Marius Cramer authored 11 years ago
  
  Conflicts: interface/web/sites/lib/lang/de_web_folder.lng interface/web/sites/lib/lang/de_web_folder_user.lng interface/web/sites/lib/lang/de_web_vhost_domain.lng interface/web/sites/lib/lang/en_web_domain.lng server/lib/classes/db_mysql.inc.php
  3faab0ca
Feb 24, 2014
- - Fixed FS#3354 - Protected folders must not be created twice. · f4de70ad
  Falko Timme authored 11 years ago
  
  - Make sure the correct sys_groupid is saved for web folders and web folder users.
  f4de70ad
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · 83c58ebb
  Marius Cramer authored 11 years ago
  
  83c58ebb
- Added db query to error log · a1918e5a
  Marius Cramer authored 11 years ago
  
  a1918e5a
- Fixed error handling problem in mysql db library. · 99101991
  Till Brehm authored 11 years ago
  
  99101991
- fixed typo in dns_dkim.tform.php · 218b7b61
  Florian Schaal authored 11 years ago
  
  218b7b61
- Add minimum ttl values in dns dkim records · 111cac70
  Florian Schaal authored 11 years ago
  
  111cac70
Feb 23, 2014
- FS#3091 - Output encoding problems in monitor module. · 6faf141a
  Till Brehm authored 11 years ago
  
  6faf141a
- Fixed: FS#2954 - Add minimum ttl values in all dns sub records · d229c257
  Till Brehm authored 11 years ago
  
  d229c257
Feb 22, 2014
- Fixed: FS#3261 - APS Deletes error folder · 99ca0f7a
  Till Brehm authored 11 years ago
  
  99ca0f7a
- quoted disablesieve-filter in mail/mail_user_edit.php · 5fbd5747
  Till Brehm authored 11 years ago
  
  5fbd5747
- Fixed: FS#3189 - APS Installation Issues · 9938f671
  Till Brehm authored 11 years ago
  
  9938f671
- Fixed: FS#3350 - [Dovecot] Warning: mysql: Query failed, retrying: Unknown... · b002da1d
  Till Brehm authored 11 years ago
  
  Fixed: FS#3350 - [Dovecot] Warning: mysql: Query failed, retrying: Unknown column 'filter' in 'where clause'
  b002da1d
Feb 21, 2014
- Fixed: FS#3341 - 3.0.5 fstab log bind fail on glusterfs · ff5b8653
  Till Brehm authored 11 years ago
  
  ff5b8653
- Fixed: FS#3351 - UK shows in wrong order when creating new client · fddd90d3
  Till Brehm authored 11 years ago
  
  fddd90d3
Feb 20, 2014
- fixed typo in 100-monitor_clamav_log.inc.php · 94a38c41
  Florian Schaal authored 11 years ago
  
  94a38c41
- changed class-name for 500-backup_mail · 955491c5
  Florian Schaal authored 11 years ago
  
  955491c5
- corrected crontab time-values for cron.sh · 9aac35e1
  Florian Schaal authored 11 years ago
  
  9aac35e1
- forgot the sql-incremental-file for mysql-quota · 4e43a84d
  Florian Schaal authored 11 years ago
  
  4e43a84d
- add mysql-quota (http://www.howtoforge.com/forums/showthread.php?t=64975 ) · 0543b213
  Florian Schaal authored 11 years ago
  
  0543b213
- Merge branch 'master' into 'master' · 18b51953
  Marius Cramer authored 11 years ago
  
  Master
  18b51953
Feb 18, 2014
- - Fixed FS#3320 - Improve php.ini parser. · 03cc01df
  Falko Timme authored 11 years ago
  
  03cc01df
- Revert "add domain and username to db-size-monitoring" · e0f619c9
  Florian Schaal authored 11 years ago
  
  This reverts commit b125fabc.
  e0f619c9
- Revert "remove sys_groupid from output" · 083cdf0a
  Florian Schaal authored 11 years ago
  
  This reverts commit bc1e70a3.
  083cdf0a
- Revert "added username to make the monitor-data usable for db-quota-checks" · e9b9fd81
  Florian Schaal authored 11 years ago
  
  This reverts commit 85851254.
  e9b9fd81
- Revert "fixed AUTHSQL" · 83bedf70
  Florian Schaal authored 11 years ago
  
  This reverts commit 366decb5.
  83bedf70
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · 1e780578
  Florian Schaal authored 11 years ago
  
  1e780578
- Missed conflict resolved from merge · 030bb96e
  Marius Cramer authored 11 years ago
  
  030bb96e
- Merge remote-tracking branch 'origin/stable-3.0.5' · 8ddcb0d7
  Marius Cramer authored 11 years ago
  
  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 11 years ago
  
  05481a4f