Commits · master · ISPConfig / ISPConfig 3

28 Nov, 2018 1 commit
- Merge branch 'master' into 'master' · 922b2803
  
  Till Brehm authored Nov 28, 2018
```
create bg default index.html

See merge request !842
```
  922b2803
27 Nov, 2018 2 commits
- Update standard_index.html_bg · af030ccf
  Paco authored Nov 27, 2018
  
  af030ccf
- Add new file · 60820b77
  Paco authored Nov 27, 2018
  
  60820b77
12 Nov, 2018 8 commits
- Revert "Merge branch 'merge-nginx-apache-plugins' into 'master'" · 397dc0ce
  
  Marius Burkard authored Nov 12, 2018
```
This reverts merge request !841
```
  397dc0ce
- Merge branch 'merge-nginx-apache-plugins' into 'master' · df074a80
  Marius Burkard authored Nov 12, 2018
```
unified nginx and apache plugin

See merge request !841
```
  df074a80
- - unified nginx and apache plugin · 90705337
  Marius Burkard authored Nov 12, 2018
```
- sourced out duplicate code
```
  90705337
- Merge branch 'remove-php-modes' into 'master' · 001bac91
  Marius Burkard authored Nov 12, 2018
```
Remove php modes

Closes #4893

See merge request !840
```
  001bac91
- - removed all deprecated PHP handlers (hhvm, cgi, suphp) · 7349f551
  Marius Burkard authored Nov 12, 2018
  
  7349f551
- Merge branch 'remove-php-modes' · 1966e837
  Marius Burkard authored Nov 12, 2018
  
  1966e837
- - fixed spare merge conflict line · abcae111
  Marius Burkard authored Nov 12, 2018
  
  abcae111
- Merge remote-tracking branch 'ispconfig3.official/master' · d8193946
  Marius Burkard authored Nov 12, 2018
  
  d8193946
05 Nov, 2018 3 commits
- Merge branch 'master' into 'master' · ea9f8ef6
  
  Till Brehm authored Nov 05, 2018
```
Add website_symlink_plugin.inc.php

See merge request !838
```
  ea9f8ef6
- Update website_symlink_plugin.inc.php · f9626973
  Till Brehm authored Nov 05, 2018
  
  f9626973
- Add website_symlink_plugin.inc.php · 2cd49f48
  Choong Wei Tjeng authored Nov 05, 2018
  
  2cd49f48
29 Oct, 2018 4 commits
- Merge branch 'patch-4' into 'master' · 0281760d
  
  Till Brehm authored Oct 29, 2018
```
Patch 4

See merge request !833
```
  0281760d
- Merge branch 'patch-3' into 'master' · c9275b2a
  Till Brehm authored Oct 29, 2018
```
Patch 3

See merge request !832
```
  c9275b2a
- Merge branch 'patch-2' into 'master' · dfcb732f
  Till Brehm authored Oct 29, 2018
```
Patch 2

See merge request !831
```
  dfcb732f
- Merge branch 'patch-1' into 'master' · f05f7828
  Till Brehm authored Oct 29, 2018
```
Patch 1

See merge request !830
```
  f05f7828
28 Oct, 2018 4 commits
- Update vhost.conf.master to support TLS v1.3 ciphers · b172e3f4
  Hj Ahmad Rasyid Hj Ismail authored Oct 28, 2018
  
  b172e3f4
- Update nginx_vhost.conf.master to support TLS v1.3 and its ciphers · 01df7d60
  Hj Ahmad Rasyid Hj Ismail authored Oct 28, 2018
  
  01df7d60
- Update apache_ispconfig.vhost.master to support TLS v1.3 ciphers · f5543ea0
  Hj Ahmad Rasyid Hj Ismail authored Oct 28, 2018
  
  f5543ea0
- Update nginx_ispconfig.vhost.master to support TLS v1.3 and its ciphers. · aa8da84a
  Hj Ahmad Rasyid Hj Ismail authored Oct 28, 2018
  
  aa8da84a
25 Oct, 2018 18 commits
- Merge branch 'stable-3.1' · 939f4aa0
  
  Marius Burkard authored Oct 25, 2018
  
  939f4aa0
- - partly revert previous · 6628fb3d
  Marius Burkard authored Oct 25, 2018
  
  6628fb3d
- Merge branch 'stable-3.1' · bdb066a8
  
  Marius Burkard authored Oct 25, 2018
  
  bdb066a8
- - loosen limits for pipelines · d6444a32
  Marius Burkard authored Oct 25, 2018
  
  d6444a32
- Merge branch 'stable-3.1' · 7ed154e9
  Marius Burkard authored Oct 25, 2018
  
  7ed154e9
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · 14b6f07c
  Marius Burkard authored Oct 25, 2018
  
  14b6f07c
- - limit syntax pipeline to schedules · 52afa697
  Marius Burkard authored Oct 25, 2018
  
  52afa697
- Update README.md · 0bc89b9c
  Marius Burkard authored Oct 25, 2018
  
  0bc89b9c
- Update README.md · fa984021
  
  Marius Burkard authored Oct 25, 2018
  
  fa984021
- Update README.md · 6d629dd7
  
  Marius Burkard authored Oct 25, 2018
  
  6d629dd7
- Update README.md · c7e7e585
  
  Marius Burkard authored Oct 25, 2018
  
  c7e7e585
- Merge branch 'stable-3.1' · 48bad7b8
  
  Marius Burkard authored Oct 25, 2018
  
  48bad7b8
- - changed gitignore file · c8e56a74
  Marius Burkard authored Oct 25, 2018
  
  c8e56a74
- Merge branch 'patch-ci-test' into 'master' · 8eca4409
  
  Marius Burkard authored Oct 25, 2018
```
Add ci test for php syntax

See merge request !827
```
  8eca4409
- Merge branch 'master' into 'patch-ci-test' · e10bb13c
  Marius Burkard authored Oct 25, 2018
```
# Conflicts:
#   .gitlab-ci.yml
```
  e10bb13c
- Merge branch 'stable-3.1' · 93edc7d2
  
  Marius Burkard authored Oct 25, 2018
  
  93edc7d2
- phplint config from merge request !827 · 3121ea9f
  Marius Burkard authored Oct 25, 2018
  
  3121ea9f
- - taken gitlab ci config from merge request !827 · 9a1f097f
  Marius Burkard authored Oct 25, 2018
  
  9a1f097f