Commits · 62f5b704bcf35b25f5fabbadd8faa9d70b0b3fbf · Jozef Sroka / ISPConfig 3

Mar 22, 2016
- Merge branch 'master' into 'stable-3.1' · 62f5b704
  Marius Burkard authored Mar 22, 2016
```
fixed typo



See merge request !300
```
  62f5b704
- fixed typo · 5ca959fa
  Florian Schaal authored Mar 22, 2016
  
  5ca959fa
Mar 19, 2016
- Merge branch 'master' into 'stable-3.1' · dfe337e0
  Marius Burkard authored Mar 19, 2016
```
fixed bastille-detection during install



See merge request !298
```
  dfe337e0
- fixed bastille-detection during install · 567aeab1
  Florian Schaal authored Mar 19, 2016
  
  567aeab1
Mar 17, 2016
- Merge branch 'master' into 'stable-3.1' · 21ef2a6c
  Marius Burkard authored Mar 17, 2016
```
changed regex for backup_dir (allow empty backup-dir to disable backups)



See merge request !296
```
  21ef2a6c
- changed regex for backup_dir (allow empty backup-dir to disable backups) · 93e7c2d5
  Florian Schaal authored Mar 17, 2016
  
  93e7c2d5
Mar 14, 2016
- Merge branch 'master' into 'stable-3.1' · 80c6a7f5
  Marius Burkard authored Mar 14, 2016
```
fixed dns-import for dmarc and dkim (Fixes #3792)



See merge request !294
```
  80c6a7f5
- Merge branch 'patch-1' into 'stable-3.1' · 65c80f1a
  Marius Burkard authored Mar 14, 2016
```
missing new line at the end of the line causes conflicts with the following line



See merge request !295
```
  65c80f1a
Mar 12, 2016
- missing new line at the end of the line causes conflicts with the following line · f5895d64
  Hasan H. Gürsoy authored Mar 12, 2016
  
  f5895d64
Mar 09, 2016
- Changed download URL for dev versions to https. · 9467043d
  Till Brehm authored Mar 09, 2016
  
  9467043d
- fixed dns-import for dmarc and dkim (Fixes #3792 ) · 81b7f708
  Florian Schaal authored Mar 09, 2016
  
  81b7f708
Mar 08, 2016
- Merge branch 'nginx_apps.vhost.master_mailman' into 'stable-3.1' · 50ff3874
  Marius Burkard authored Mar 08, 2016
```
Fix #3787 Remove wrong fastcgi_param SCRIPT_FILENAME for Mailman in nginx_apps.vhost.master



See merge request !292
```
  50ff3874
- Merge branch 'master' into 'stable-3.1' · 81a4dc5a
  Marius Burkard authored Mar 08, 2016
```
Master



See merge request !293
```
  81a4dc5a
- fixed nginx-startup errors on systems with net.ipv6.bindv6only=0 · 3279f891
  Florian Schaal authored Mar 08, 2016
  
  3279f891
- Errors in automatically generated nginx configuration files (Fixes #3774) · c6f93e01
  Florian Schaal authored Mar 08, 2016
  
  c6f93e01
Mar 02, 2016
- Merge branch 'stable-3.1' · 2a24c613
  Marius Burkard authored Mar 02, 2016
  
  2a24c613
- - make session.save_path overridable in php-fpm (Fixes #3791 ) · 9fd93035
  Marius Burkard authored Mar 02, 2016
  
  9fd93035
- Use correct php.ini master file on custom directives (Fixes #3790 ) · 93292a99
  Marius Burkard authored Mar 02, 2016
  
  93292a99
- Merge branch 'stable-3.1' · 2f74cf27
  Marius Burkard authored Mar 02, 2016
  
  2f74cf27
- - removed unneeded security check (Fixes #3785) · 632f1566
  Marius Burkard authored Mar 02, 2016
  
  632f1566
- Merge branch 'stable-3.1' · 59f3ca62
  Marius Burkard authored Mar 02, 2016
  
  59f3ca62
- - markdown · da7597f5
  Marius Burkard authored Mar 02, 2016
  
  da7597f5
- Merge branch 'stable-3.1' · fb41e213
  Marius Burkard authored Mar 02, 2016
  
  fb41e213
- Merge branch 'bweston/ispconfig3-feature/use-contributing-file' into stable-3.1 · 65ee075f
  Marius Burkard authored Mar 02, 2016
  
  65ee075f
- Merge branch 'feature/git-attributes' into 'stable-3.1' · 1325b117
  Marius Burkard authored Mar 02, 2016
```
Git attributes file to make sure Windows developers don't commit bad line endings.

To obey http://git.ispconfig.org/ispconfig/ispconfig3/blob/45e9406a0fd6e872219a09d913bdfa49bd22e87b/CODING_NOTES.php.txt#L3

https://help.github.com/articles/dealing-with-line-endings/

See merge request !290
```
  1325b117
- Merge branch 'stable-3.1' · 75124b01
  Marius Burkard authored Mar 02, 2016
  
  75124b01
- Fix #3787 Remove wrong fastcgi_param SCRIPT_FILENAME for Mailman in nginx_apps.vhost.master · 61137eea
  Robert Utnehmer authored Mar 02, 2016
  
  61137eea
- - another addition on coding guidelines (PHP 5.3) · 33f1938b
  Marius Burkard authored Mar 02, 2016
  
  33f1938b
- - added line to guidelines · 01c6f903
  Marius Burkard authored Mar 02, 2016
  
  01c6f903
- - re-factored coding guidelines · 46ea1abc
  Marius Burkard authored Mar 02, 2016
  
  46ea1abc
Mar 01, 2016
- Added gitattributes to make sure LF line endings are used. · a8bade63
  Bradley Weston authored Mar 01, 2016
  
  a8bade63
- Use CONTRIBUTING.md to follow standard for most SCM systems. · 87793c98
  Bradley Weston authored Mar 01, 2016
  
  87793c98
Feb 29, 2016
- Merge branch 'stable-3.1' · 45e9406a
  Marius Burkard authored Feb 29, 2016
  
  45e9406a
- Merge branch 'master' into 'stable-3.1' · dad105ff
  Marius Burkard authored Feb 29, 2016
```
more detaled informations during install/setup when mysql is not using NO_ENGINE_SUBSTITUTION



See merge request !288
```
  dad105ff
- - fixed ssl disabling on letsencrypt and added aliasdomain (Fixes: #3779 ) · 50306f02
  Marius Burkard authored Feb 29, 2016
  
  50306f02
- - fixed problem with ipv6 set to * · 96f31df0
  Marius Burkard authored Feb 29, 2016
  
  96f31df0
- fixed uninstaller · c51b57e0
  Florian Schaal authored Feb 29, 2016
  
  c51b57e0
- fixed typo · 7d6777cb
  Florian Schaal authored Feb 29, 2016
  
  7d6777cb
Feb 28, 2016
- more detaled informations during install/setup when mysql is not using NO_ENGINE_SUBSTITUTION · 2b3b4cfe
  Florian Schaal authored Feb 28, 2016
  
  2b3b4cfe
Feb 25, 2016
- Merge branch 'master' into 'stable-3.1' · b01718a0
  Marius Burkard authored Feb 25, 2016
```
Master



See merge request !287
```
  b01718a0