Commits · 20e01532de8836a941d9a180ee813a607490e087 · ISPConfig / ISPConfig 3

Jan 10, 2014
- Merge branch 'master' of /home/git/repositories/florian030/ispconfig3 · 20e01532
  Marius Cramer authored Jan 10, 2014
  
  20e01532
Jan 08, 2014
- fixed typo · 2e5b1afd
  Florian Schaal authored Jan 08, 2014
  
  2e5b1afd
- backup only active domains · f2f79018
  Florian Schaal authored Jan 08, 2014
  
  f2f79018
- Allow the admin to configure the deleting of backups when a web-site / mail-domain is deleted. · a8123880
  Florian Schaal authored Jan 08, 2014
  
  a8123880
Jan 07, 2014
- added missing ?> · f858c22b
  Florian Schaal authored Jan 07, 2014
  
  f858c22b
- Merge remote-tracking branch 'origin/stable-3.0.5' · ddb461f5
  Marius Cramer authored Jan 07, 2014
```
Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/lib/classes/remoting_lib.inc.php
	interface/lib/classes/tform.inc.php
	interface/web/admin/lib/lang/de_server_config.lng
	interface/web/admin/lib/lang/de_system_config.lng
	interface/web/admin/lib/lang/en_server_config.lng
	interface/web/client/lib/lang/en_client.lng
	interface/web/client/lib/lang/en_reseller.lng
	interface/web/login/lib/lang/de.lng
	interface/web/mail/form/mail_user.tform.php
	interface/web/mail/lib/lang/de_mail_user.lng
	interface/web/mail/lib/lang/en_mail_user.lng
	interface/web/sites/lib/lang/de_web_domain.lng
	interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
	interface/web/sites/web_domain_edit.php
	server/cron_daily.php
	server/plugins-available/backup_plugin.inc.php
```
  ddb461f5
- Merge branch 'master' of /home/git/repositories/florian030/ispconfig3 · c1ff9051
  Marius Cramer authored Jan 07, 2014
  
  c1ff9051
- fixed typo · d2c04c19
  Florian Schaal authored Jan 07, 2014
  
  d2c04c19
- minor changes for deleting backups when deleting the web-domain · 0f89bd92
  Florian Schaal authored Jan 07, 2014
  
  0f89bd92
- remove backups when deleting a mail-domain or mail-user · 2604cb9f
  Florian Schaal authored Jan 07, 2014
  
  2604cb9f
- Updated incremental svn files. · c3d8a845
  Till Brehm authored Jan 07, 2014
  
  c3d8a845
- Updated incremental svn files. · 6d6a37b9
  Till Brehm authored Jan 07, 2014
  
  6d6a37b9
- remove backups when deleting a web-domain · 69b1bc6d
  Florian Schaal authored Jan 07, 2014
  
  69b1bc6d
Jan 06, 2014
- Merge branch 'master' of /home/git/repositories/florian030/ispconfig3 · 4ad68490
  Till Brehm authored Jan 06, 2014
  
  4ad68490
- Merge branch 'master' of /home/git/repositories/Schoene/ispconfig3 · 0b50f8f4
  Till Brehm authored Jan 06, 2014
  
  0b50f8f4
Jan 05, 2014
- added database-modifications for mail-backup · 2e145303
  Florian Schaal authored Jan 05, 2014
  
  2e145303
Jan 04, 2014
- fix missing " · de6d2e9a
  Carsten authored Jan 04, 2014
  
  de6d2e9a
- use ajax backend for IPv6 addresses in dns wizard · 7cb413af
  Carsten authored Jan 04, 2014
  
  7cb413af
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · 8edb9c1a
  Florian Schaal authored Jan 04, 2014
  
  8edb9c1a
- add mail-backup · f17718f8
  Florian Schaal authored Jan 04, 2014
  
  f17718f8
- errorhandling for awstats.conf / awstats.model.conf · 9aaf97d8
  Carsten authored Jan 04, 2014
```
Catch situation where no basic awstats configuration can be found
and create a warning message.
```
  9aaf97d8
- fallback to awstats.model.conf if awstats.conf does not exist · e6abfe7c
  Carsten authored Jan 04, 2014
  
  e6abfe7c
Jan 03, 2014
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · c3570e54
  Till Brehm authored Jan 03, 2014
  
  c3570e54
- Implemented: FS#2837 - New functions for the API · 2ebc3305
  Till Brehm authored Jan 03, 2014
  
  2ebc3305
- Implemented: FS#2837 - New functions for the API · 3ba56480
  Till Brehm authored Jan 03, 2014
  
  3ba56480
- fix Number of domain aliases => Number of email domain aliases · a1759278
  Carsten authored Jan 03, 2014
  
  a1759278
- Merge remote-tracking branch 'schoene/master' · 53f4a0b4
  Marius Cramer authored Jan 03, 2014
  
  53f4a0b4
- fixed remove of inactive web backups · 04eafed0
  Florian Schaal authored Jan 03, 2014
  
  04eafed0
Jan 02, 2014
- Merge branch 'master' of /home/git/repositories/grungy/ispconfig3 · b80a703a
  Marius Cramer authored Jan 02, 2014
  
  b80a703a
- Merge branch 'master' of /home/git/repositories/florian030/ispconfig3 · 0d11ae20
  Marius Cramer authored Jan 02, 2014
  
  0d11ae20
- FS#3264 - Put domain name in php-fom pool name · d33fd260
  Nedim Hadzimahmutovic authored Jan 02, 2014
  
  d33fd260
Jan 01, 2014
- fix set owner of .sieve symlink · 4f69fb7e
  Carsten authored Jan 01, 2014
  
  4f69fb7e
- set correct ownership on sieve filter file and link · 86ad3973
  Carsten authored Jan 01, 2014
  
  86ad3973
- fix: create sieve directory / change to maildir before symlinking · 097ad60d
  Carsten authored Jan 01, 2014
  
  097ad60d
- be compatible to managesieve service · 3d3f4704
  Carsten authored Jan 01, 2014
```
- write sieve filter to sieve subdirectory into ispconfig.sieve
- link .sieve to sieve/ispconfig.sieve
```
  3d3f4704
- fix sieve filter "begins" regex · f9e50d88
  Carsten authored Jan 01, 2014
  
  f9e50d88
Dec 30, 2013
- Added a function to query the ispconfig version to the remote api. · 37fccba8
  Till Brehm authored Dec 30, 2013
  
  37fccba8
- fix duplicate entry caused in rr_insert · 0614b51e
  Carsten authored Dec 30, 2013
  
  0614b51e
Dec 28, 2013
- pdns slave, zone cleanup script · bbc4ad95
  Carsten authored Dec 28, 2013
```
This script deletes zones on PowerDNS Slave servers, when
the master does not have a SOA record for it (delete zone on master).
```
  bbc4ad95
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · e791e76c
  Florian Schaal authored Dec 28, 2013
  
  e791e76c