Commits · 9bf0533ae4ed613ca5077d3b6460447175b3006d · Jozef Sroka / ISPConfig 3

Mar 06, 2014
- db-quota: add lng-files · 9bf0533a
  Florian Schaal authored Mar 06, 2014
  
  9bf0533a
- 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
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
Mar 03, 2014
- 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
Feb 28, 2014
- 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
- fixed wrong group-query · ac03e946
  Dominik authored Feb 26, 2014 and Dominik committed Feb 27, 2014
  
  ac03e946
- changed wrong function call · ced73f24
  Dominik authored Feb 26, 2014 and Dominik committed Feb 27, 2014
  
  ced73f24
- fixed uses-error · b8ab8bf0
  Dominik authored Feb 26, 2014 and Dominik committed Feb 27, 2014
  
  b8ab8bf0
- Syntaxerror-korrektur · 0e80d1bc
  Dominik authored Feb 25, 2014 and Dominik committed Feb 27, 2014
  
  0e80d1bc
- Quota-Lib für remote-quota-angaben · e8b3291e
  Dominik authored Feb 25, 2014 and Dominik committed Feb 27, 2014
```
Erweiterungen für remote-Quota
```
  e8b3291e
- Merge branch 'master_fixes' into 'master' · 5a2985f9
  Dominik authored Feb 26, 2014
```
Master Fixes
```
  5a2985f9
- Merge branch 'master_fixes' into 'master' · bdc27bfe
  Marius Cramer authored Feb 26, 2014
```
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 Feb 25, 2014
  
  dbae22d2
- Merge branch 'stable-3.0.5' into 'master' · 230339ed
  Marius Cramer authored Feb 25, 2014
```
Stable 3.0.5
```
  230339ed
- Added country information · dca6af78
  Marius Cramer authored Feb 25, 2014
  
  dca6af78
- Added sql incremental data from master · c87017c8
  Marius Cramer authored Feb 25, 2014
  
  c87017c8
- Merge branch 'master' into 'master' · 0e3e3c99
  Marius Cramer authored Feb 25, 2014
```
Master
```
  0e3e3c99
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · cce9d632
  Florian Schaal authored Feb 25, 2014
  
  cce9d632
- changes according to comments on merge-request · 5b3d2c2b
  Florian Schaal authored Feb 25, 2014
  
  5b3d2c2b
- Merge remote-tracking branch 'origin/stable-3.0.5' · 3faab0ca
  Marius Cramer authored Feb 25, 2014
```
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 Feb 24, 2014
```
- 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 Feb 24, 2014
  
  83c58ebb
- Added db query to error log · a1918e5a
  Marius Cramer authored Feb 24, 2014
  
  a1918e5a
- Fixed error handling problem in mysql db library. · 99101991
  Till Brehm authored Feb 24, 2014
  
  99101991
- fixed typo in dns_dkim.tform.php · 218b7b61
  Florian Schaal authored Feb 24, 2014
  
  218b7b61
- Add minimum ttl values in dns dkim records · 111cac70
  Florian Schaal authored Feb 24, 2014
  
  111cac70
Feb 23, 2014
- FS#3091 - Output encoding problems in monitor module. · 6faf141a
  Till Brehm authored Feb 23, 2014
  
  6faf141a