Commits · f7580dde244b7180da4edf4dc6d97c1f9a0c964f · ISPConfig / ISPConfig 3

Jan 21, 2015
- fixed sql-query in dns_spf_edit.php and re-add spf-template · f7580dde
  Florian Schaal authored Jan 21, 2015
  
  f7580dde
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · 93fdfe3a
  Marius Cramer authored Jan 21, 2015
  
  93fdfe3a
- Merge branch 'renky/ispconfig3-master' · 82cf1e84
  Marius Cramer authored Jan 21, 2015
```
Conflicts:
	interface/web/mail/templates/mail_user_backup_list.htm
```
  82cf1e84
- Merge branch 'master' into 'master' · c0138f54
  Marius Cramer authored Jan 21, 2015
```
Master

See merge request !157
```
  c0138f54
Jan 18, 2015
- Added en+ Device in bastille firewall config to improve Centos 7 support. · f3f4aa5c
  Till Brehm authored Jan 18, 2015
  
  f3f4aa5c
Jan 16, 2015
- fixed issue with delete mail-backups when removing a email-user / email-domain · 55c012f8
  Florian Schaal authored Jan 16, 2015
  
  55c012f8
Jan 15, 2015
- fixed database_quota_stats-page and add server-name (FS #3791) · a8c50cdf
  Florian Schaal authored Jan 15, 2015
  
  a8c50cdf
- Removed idn2ascii filter from mail pattern field in spamfilter_users form as... · 355b48c4
  Till Brehm authored Jan 15, 2015
```
Removed idn2ascii filter from mail pattern field in spamfilter_users form as the filter alters the pattern so that the wildcard pattern @. is not possible.
```
  355b48c4
Jan 14, 2015
- correction because of php 5.3 · f42d9169
  Dominik authored Jan 14, 2015
  
  f42d9169
- fixed template 3 · 40a0bf08
  Dominik authored Jan 14, 2015
  
  40a0bf08
- Merge branch 'master' into 'master' · 66190e11
  Marius Cramer authored Jan 14, 2015
```
Master

See merge request !156
```
  66190e11
- template style - the second · 6a83ad0c
  Dominik authored Jan 14, 2015
  
  6a83ad0c
- fixed template-style · 2615e90b
  Dominik authored Jan 14, 2015
```
fixed small bug in mail-backup-cron
```
  2615e90b
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · b3f01831
  Florian Schaal authored Jan 14, 2015
  
  b3f01831
- add size to backup-stats · b2334106
  Florian Schaal authored Jan 14, 2015
  
  b2334106
- fixed template · 1a0665de
  Florian Schaal authored Jan 14, 2015
  
  1a0665de
- Merge branch 'master' into 'master' · 9bde82f2
  Marius Cramer authored Jan 14, 2015
```
Master

See merge request !155
```
  9bde82f2
- converted file to new layout html · 02872aad
  Florian Schaal authored Jan 14, 2015
  
  02872aad
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · c554c4f3
  Florian Schaal authored Jan 14, 2015
  
  c554c4f3
- - converted file to new layout html · b82b9939
  Marius Cramer authored Jan 14, 2015
  
  b82b9939
- Scroll to page top on content load · e2776cf4
  Marius Cramer authored Jan 14, 2015
  
  e2776cf4
Jan 13, 2015
- - fixed javascript position in file (template vars) · 67ef2d60
  Marius Cramer authored Jan 13, 2015
  
  67ef2d60
- - fixed javascript call in json file · 06339e0c
  Marius Cramer authored Jan 13, 2015
  
  06339e0c
- - fixed javascript for new ISPConfig object · 1b48cf93
  Marius Cramer authored Jan 13, 2015
  
  1b48cf93
- - re-added table sorting · d76e2d6e
  Marius Cramer authored Jan 13, 2015
  
  d76e2d6e
- - fixed js reference · bbb85a4e
  Marius Cramer authored Jan 13, 2015
  
  bbb85a4e
- - cleaned up javascript · 2778c9ea
  Marius Cramer authored Jan 13, 2015
```
- removed most static content from scrigo
```
  2778c9ea
- - cleaned up javascript · 9021d7fc
  Marius Cramer authored Jan 13, 2015
  
  9021d7fc
- fixed fr_resync.lng · cc2d7b29
  Florian Schaal authored Jan 13, 2015
  
  cc2d7b29
- add backup stats for mail · 746e5bba
  Florian Schaal authored Jan 13, 2015
  
  746e5bba
- - Fixed column sorting · 2d0ebade
  Marius Cramer authored Jan 13, 2015
```
- cleaned up some javascript
```
  2d0ebade
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · c193ade1
  Marius Cramer authored Jan 13, 2015
  
  c193ade1
- - added utf8 conversion to db escape function · 385f5459
  Marius Cramer authored Jan 13, 2015
  
  385f5459
Jan 11, 2015
- Merge branch 'master' of http://git.ispconfig.org/renky/ispconfig3 · 01e0759f
  Dominik authored Jan 11, 2015
  
  01e0759f
- used new mount-backup-functions again · f8fda452
  Dominik authored Jan 11, 2015
  
  f8fda452
- formatBytes for backup-filesizes in interface · 97321a45
  Dominik authored Jan 11, 2015
  
  97321a45
- fixed missing change to backup_restore_mail-action · 333ca07c
  Dominik authored Jan 11, 2015
  
  333ca07c
- fix sql-update · 3783361d
  Dominik authored Jan 11, 2015
  
  3783361d
- fixed confusion about restoring mail/web-backup with same id · d2c52bba
  Dominik authored Jan 11, 2015
  
  d2c52bba
- renamed incremental sql-file · 053a837f
  Dominik authored Jan 11, 2015
  
  053a837f