Commits · 2e466274c2d7ae6410c212a27c87c9eafe95e8f1 · ISPConfig / ISPConfig 3 · GitLab

21 Mar, 2016 3 commits
- Some string translated, lines sort case insensitive and clean empty spaces/new lines after ?> · 2e466274
  CristianDeluxe authored Mar 21, 2016
  
  2e466274
- Language es_ES in progress, new (untraslated) strings and fixes in existing ones (2) · ad30820a
  CristianDeluxe authored Mar 21, 2016
  
  ad30820a
- Language es_ES in progress, new (untraslated) strings and fixes in existing ones · e32846b4
  CristianDeluxe authored Mar 21, 2016
  
  e32846b4
02 Mar, 2016 14 commits
- 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
- - 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
01 Mar, 2016 2 commits
- 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
29 Feb, 2016 6 commits
- 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
28 Feb, 2016 1 commit
- more detaled informations during install/setup when mysql is not using NO_ENGINE_SUBSTITUTION · 2b3b4cfe
  Florian Schaal authored Feb 28, 2016
  
  2b3b4cfe
25 Feb, 2016 5 commits
- Merge branch 'master' into 'stable-3.1' · b01718a0
  Marius Burkard authored Feb 25, 2016
```
Master



See merge request !287
```
  b01718a0
- Removed content from todo file and replaced it with a link to the issue tracker. · 7d2d6779
  Till Brehm authored Feb 25, 2016
  
  7d2d6779
- IPv6 - assign address (Fixes #3733) · 99fcaa5f
  Florian Schaal authored Feb 25, 2016
  
  99fcaa5f
- fixed last commit · b0fb62f4
  Florian Schaal authored Feb 25, 2016
  
  b0fb62f4
- validate serverip depending on ipv4/ipv6 · d83abe08
  Florian Schaal authored Feb 25, 2016
  
  d83abe08
24 Feb, 2016 4 commits
- allow only ipv4 for Server IPv4 Mapping · 207169b1
  Florian Schaal authored Feb 24, 2016
  
  207169b1
- Merge branch 'stable-3.1' · 5e82da8c
  Marius Burkard authored Feb 24, 2016
  
  5e82da8c
- Merge branch 'master' into 'stable-3.1' · f91c0701
  Marius Burkard authored Feb 24, 2016
```
Master

Fixes #3731 

See merge request !286
```
  f91c0701
- Website domain can not be changed by client (Issue #3731) · f7bdb7e7
  Florian Schaal authored Feb 24, 2016
  
  f7bdb7e7
21 Feb, 2016 4 commits
- Merge branch 'stable-3.1' · 8a4a0573
  Marius Burkard authored Feb 21, 2016
  
  8a4a0573
- Merge branch 'master' into 'stable-3.1' · 856a3fda
  Marius Burkard authored Feb 21, 2016
```
Master

Closes #2586 

See merge request !285
```
  856a3fda
- fixed last commit · 2527d261
  Florian Schaal authored Feb 21, 2016
  
  2527d261
- Add DB-User limit (Issue #2586) · 7e2a3fa2
  Florian Schaal authored Feb 21, 2016
  
  7e2a3fa2
20 Feb, 2016 1 commit
- Merge branch 'stable-3.1' · c74c6544
  Marius Burkard authored Feb 20, 2016
  
  c74c6544