Commits · 10e9f75e0948d9dd72a4431c67292a05d582483c · ISPConfig / ISPConfig 3

08 Dec, 2015 3 commits
- Merge branch 'master' into 'master' · 10e9f75e
  Marius Burkard authored Dec 08, 2015
```
fixed error in mail_backup -> all mail-backups would have been deleted with old …

…code because of * in filename

See merge request !247
```
  10e9f75e
- Merge branch 'stable-3.0.5' · 2dffea3c
  Marius Cramer authored Dec 08, 2015
  
  2dffea3c
- - Merged https://github.com/alexalouit/ISPConfig-letsencrypt.git · 018c55dd
  Marius Cramer authored Dec 08, 2015
  
  018c55dd
04 Dec, 2015 1 commit
- Merge branch 'stable-3.0.5' · 8fe08ad4
  Marius Cramer authored Dec 04, 2015
  
  8fe08ad4
03 Dec, 2015 1 commit
- Updated Czech language files. · 1fbf0d38
  Till Brehm authored Dec 03, 2015
  
  1fbf0d38
30 Nov, 2015 1 commit
- Merge branch 'master' into 'master' · e6ded3ab
  Marius Burkard authored Nov 30, 2015
```
Master



See merge request !249
```
  e6ded3ab
29 Nov, 2015 3 commits
- FS#3837 - Adaptec-RAID in ISPConfig-Monitor (code) (wemaflo) · 5e205c44
  Florian Schaal authored Nov 29, 2015
  
  5e205c44
- FS#3885 - LSI MegaRaid monitoring (code) (cwispy) · d7f1c84e
  Florian Schaal authored Nov 29, 2015
  
  d7f1c84e
- FS#3806 - HP Proliant / SmartArray RAID-Status incl. Code (PatrickR) · 248d0eeb
  Florian Schaal authored Nov 29, 2015
  
  248d0eeb
26 Nov, 2015 2 commits
- Merge branch 'master' into 'master' · add7cc46
  Marius Burkard authored Nov 26, 2015
```
add XMPP fields in client template database table



See merge request !248
```
  add7cc46
- add XMPP fields in client template database table · d8824923
  Jan-Claas Dirks authored Nov 26, 2015
  
  d8824923
21 Nov, 2015 1 commit
- fixed error in mail_backup -> all mail-backups would have been deleted with... · 2bc9e127
  root authored Nov 21, 2015
```
fixed error in mail_backup -> all mail-backups would have been deleted with old code because of * in filename
```
  2bc9e127
20 Nov, 2015 1 commit
- Merge branch 'master' into 'master' · 8938c852
  Marius Cramer authored Nov 20, 2015
```
Master

Added possibility to delete backups manually

See merge request !246
```
  8938c852
19 Nov, 2015 2 commits

fixed sql-syntax · aa365c41
root authored Nov 19, 2015

aa365c41

Added possibility to delete backups · 634132a0

Dominik authored Nov 19, 2015

Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/mail/templates/mail_user_backup_list.htm
	interface/web/sites/lib/lang/en_web_backup_list.lng
	interface/web/sites/lib/lang/es_web_backup_list.lng
	interface/web/sites/lib/lang/tr_web_backup_list.lng
	server/plugins-available/backup_plugin.inc.php

634132a0

17 Nov, 2015 5 commits
- Merge branch 'stable-3.0.5' · a5714c39
  Marius Cramer authored Nov 17, 2015
  
  a5714c39
- - allow partly configured autoinstall.ini · c8509bf2
  Marius Cramer authored Nov 17, 2015
  
  c8509bf2
- Merge branch 'master' into 'master' · fe9b73c3
  Marius Cramer authored Nov 17, 2015
```
Master



See merge request !244
```
  fe9b73c3
- typo · f562971d
  Florian Schaal authored Nov 17, 2015
  
  f562971d
- fixed remove inactive mail-backups · ef5c451d
  Florian Schaal authored Nov 17, 2015
  
  ef5c451d
16 Nov, 2015 1 commit
- - Added missing version change · 26e265ea
  Marius Cramer authored Nov 16, 2015
  
  26e265ea
15 Nov, 2015 12 commits
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · e0e69db9
  Marius Cramer authored Nov 15, 2015
  
  e0e69db9
- - Fixed mysql library (server version) · bc09783c
  Marius Cramer authored Nov 15, 2015
  
  bc09783c
- - Changed APS to 1.2 · 0e3df6c9
  Marius Cramer authored Nov 15, 2015
```
- Fixed error in mysql library
```
  0e3df6c9
- Added accordion style collapsible on reseller limits form. · 6659cd94
  Till Brehm authored Nov 15, 2015
  
  6659cd94
- Removed todo strings from tabbed_form.tpl.htm. · 4e822137
  Till Brehm authored Nov 15, 2015
  
  4e822137
- Added missing delimiter settings in reseller form file. · f4f981d8
  Till Brehm authored Nov 15, 2015
  
  f4f981d8
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · 0c1bc352
  Till Brehm authored Nov 15, 2015
  
  0c1bc352
- Added accordion style collapsible on client limits form. · c52fa27a
  Till Brehm authored Nov 15, 2015
  
  c52fa27a
- Merge branch 'master' into 'master' · 85fdab1f
  Marius Cramer authored Nov 15, 2015
```
Master



See merge request !243
```
  85fdab1f
- once more.... · 798c41ad
  Florian Schaal authored Nov 15, 2015
  
  798c41ad
- fixed last commit · 063932b0
  Florian Schaal authored Nov 15, 2015
  
  063932b0
- postfix server-plugin (check your changes before restarting postfix) · 52bbc896
  Florian Schaal authored Nov 15, 2015
  
  52bbc896
14 Nov, 2015 7 commits
- Merge branch 'master' into 'master' · b717d292
  Marius Cramer authored Nov 14, 2015
```
FS#4031 - Disabling server option "Network Filesystem" does not work



See merge request !242
```
  b717d292
- FS#4017 - mailman issues with postmap · f8bc88f0
  Florian Schaal authored Nov 14, 2015
  
  f8bc88f0
- FS#4031 - Disabling server option "Network Filesystem" does not work · c8679f3e
  Florian Schaal authored Nov 14, 2015
  
  c8679f3e
- Adjust height of Select2 boxes for forms only and not list headers. · 576d93bb
  Till Brehm authored Nov 14, 2015
  
  576d93bb
- Fixed PHP warning when no IDN filters are set for field in lists. · cc636e1a
  Till Brehm authored Nov 14, 2015
  
  cc636e1a
- Updated ispconfig.min.css · 50bb597a
  Till Brehm authored Nov 14, 2015
  
  50bb597a
- Improved mailbox form. · 29add223
  Till Brehm authored Nov 14, 2015
  
  29add223