Commits · 01cec5b1c398128778ae9e1dff95b22deb9b10cc · ISPConfig / ISPConfig 3

Nov 27, 2014
- - First part of layout change for 3.1 · 01cec5b1
  Marius Cramer authored Nov 27, 2014
  
  01cec5b1
- Merge remote-tracking branch 'ispc/master' into new-layout-3.1 · b553b2bf
  Marius Cramer authored Nov 27, 2014
  
  b553b2bf
Nov 26, 2014
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · f6174df1
  Marius Cramer authored Nov 26, 2014
  
  f6174df1
Nov 24, 2014
- fix FS#3659 · eebf5bbf
  Patrick Anders authored Nov 24, 2014
  
  eebf5bbf
- add lost_password_function · bde52436
  Patrick Anders authored Nov 20, 2014
  
  bde52436
Nov 20, 2014
- add lost_password_function · 0de30f90
  linchyim authored Nov 20, 2014
  
  0de30f90
Nov 06, 2014
- Merge branch 'master' into 'master' · a66bbd6c
  Marius Cramer authored Nov 06, 2014
```
Master

See merge request !138
```
  a66bbd6c
- Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 · 208a069f
  Florian Schaal authored Nov 06, 2014
  
  208a069f
- moved "mount backup_dir" from various plugins to system.inc.php · 990ca8a4
  Florian Schaal authored Nov 06, 2014
  
  990ca8a4
Nov 04, 2014
- Merge remote-tracking branch 'ispc/master' · 108dd924
  Marius Cramer authored Nov 04, 2014
  
  108dd924
- (re)add filesize to website-backups · 0b22b5ef
  Florian Schaal authored Nov 04, 2014
  
  0b22b5ef
- updated db-queries to the new query form · 0269573d
  Florian Schaal authored Nov 04, 2014
  
  0269573d
- updated db-queries to the new query form · bc0ad024
  Florian Schaal authored Nov 04, 2014
  
  bc0ad024
- add $backup_dir_mount_cmd to mail-backup · 28a1dcf7
  Florian Schaal authored Nov 04, 2014
  
  28a1dcf7
Nov 03, 2014
- FS#3726 - Generated DKIM Selector has an invalid format · 8797b6fa
  Florian Schaal authored Nov 03, 2014
  
  8797b6fa
- backup: change mounts to backup_dir_mount_cmd · ea5eee59
  Florian Schaal authored Nov 03, 2014
  
  ea5eee59
- mailbackup: fixed domain-query · c4be523f
  Florian Schaal authored Nov 03, 2014
  
  c4be523f
Oct 31, 2014
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · c28bb432
  Marius Cramer authored Oct 31, 2014
  
  c28bb432
- Merge remote-tracking branch 'origin/stable-3.0.5' · 1102cc88
  Marius Cramer authored Oct 31, 2014
```
Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	install/uninstall.php
	interface/lib/config.inc.php
	interface/web/themes/blue/ispconfig_version
```
  1102cc88
- Merge branch 'master' into 'master' · 474f4595
  Marius Cramer authored Oct 31, 2014
```
Master

See merge request !135
```
  474f4595
Oct 30, 2014
- fixed template and query in mail_domain_dkim.js · 21cdaaaa
  Florian Schaal authored Oct 30, 2014
  
  21cdaaaa
Oct 29, 2014
- Fixed: FS#3721 - php-fpm brocken · c91c7a62
  Till Brehm authored Oct 29, 2014
  
  c91c7a62
- re-add missing part to mail_domain_dkim.js · 872f64b3
  Florian Schaal authored Oct 29, 2014
  
  872f64b3
- dkim: fixed issue with the domain-module · b3a7a341
  Florian Schaal authored Oct 29, 2014
  
  b3a7a341
- Merge branch 'master' into 'master' · 871298f2
  Marius Cramer authored Oct 29, 2014
```
Master

See merge request !134
```
  871298f2
- Merge branch 'master_fixes' into 'master' · 4e52e111
  Marius Cramer authored Oct 29, 2014
```
Master fixes

Fixed problem that broke the updater (wrong name of variable)

See merge request !133
```
  4e52e111
- Fixed a Bug in Centos 7 were php-fpm uses sockets while mod_proxy_fcgi in... · 6db03623
  Till Brehm authored Oct 29, 2014
```
Fixed a Bug in Centos 7 were php-fpm uses sockets while mod_proxy_fcgi in centos 7 does not support that yet.
```
  6db03623
Oct 28, 2014
- fixed sql-query when resync mailbox · 95149716
  Florian Schaal authored Oct 28, 2014
  
  95149716
- changed checkpath for dkim-dir · a8739d9e
  Florian Schaal authored Oct 28, 2014
  
  a8739d9e
- Fixed broken updater · 1ecc750c
  Dominik Müller authored Oct 28, 2014
  
  1ecc750c
- Changed version number to 3.0.5.4p5 · 8348c814
  Till Brehm authored Oct 28, 2014
  
  3.0.5.4p5
  
  8348c814
- Fixed mysql restart problems in Ubuntu 14.10 · 574a163a
  Till Brehm authored Oct 28, 2014
  
  574a163a
- - Changed tform_actions.inc.php to always provide oldDataRecord array for... · 61f73820
  Till Brehm authored Oct 28, 2014
```
- Changed tform_actions.inc.php to always provide oldDataRecord array for updates even when dbhistory = off.
```
  61f73820
Oct 27, 2014
- - Fixed hanging update on ubuntu 14.10 caused by mysql restart script. · 1e67c170
  Till Brehm authored Oct 27, 2014
```
- Fixed: FS#3710 - Bug with PHP-FPM configuration since 3.0.5.4 Patch 4
- Fixed wrong function calls in system lib.
```
  1e67c170
- - Added version detection for Ubuntu 14.10 · bc04c3a5
  Till Brehm authored Oct 27, 2014
```
- Fixed a problem with restart of services due to the fact that Ubuntu has upstart and systemd installed, but only upstart is working without errors.
```
  bc04c3a5
- Fixed: FS#3718 - SQL injection checker false positive alert in APS installer · 0e34bade
  Till Brehm authored Oct 27, 2014
  
  0e34bade
Oct 24, 2014
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · 919c2367
  Marius Cramer authored Oct 24, 2014
  
  919c2367
- Merge branch 'stable-3.0.5' · 5ec4395f
  Marius Cramer authored Oct 24, 2014
```
Conflicts:
	install/dist/lib/fedora.lib.php
	install/dist/lib/opensuse.lib.php
```
  5ec4395f
- Merge branch 'master' into 'master' · 2d5fcd53
  Marius Cramer authored Oct 24, 2014
```
Master

See merge request !132
```
  2d5fcd53
- fixed resync_do.php · 712363b1
  Florian Schaal authored Oct 24, 2014
  
  712363b1