Commits · master · Jonas / ISPConfig 3

29 Oct, 2018 - 4 commits
- Merge branch 'patch-4' into 'master' · 0281760d
  Till Brehm authored Oct 29, 2018
```
Patch 4

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

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

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

See merge request ispconfig/ispconfig3!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 - 22 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 ispconfig/ispconfig3!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
- taken gitlab ci from merge request !827 · ca6e0cc0
  Marius Burkard authored Oct 25, 2018
  
  ca6e0cc0
- Merge branch 'stable-3.1' · 6ffa1f6f
  Marius Burkard authored Oct 25, 2018
  
  6ffa1f6f
- - added gitlab ci file for php syntax check · d8b0b842
  Marius Burkard authored Oct 25, 2018
  
  d8b0b842
- Fixed #5165 PHP Syntax error in "install/dist/lib/opensuse.lib.php" on line 510 · c3be1c38
  Till Brehm authored Oct 25, 2018
  
  c3be1c38
18 Oct, 2018 - 1 commit
- Merge branch 'stable-3.1' into 'stable-3.1' · 1c365f0c
  Till Brehm authored Oct 18, 2018
```
fix getDatabaseSize()

See merge request !829
```
  1c365f0c
17 Oct, 2018 - 1 commit
- fix getDatabaseSize() · 8c4359bb
  Jesse Norell authored Oct 17, 2018
  
  8c4359bb
15 Oct, 2018 - 8 commits
- Merge branch 'patch-3' into 'master' · 9e96b63b
  Till Brehm authored Oct 15, 2018
```
Do not show db or site quota when the sites module is not active

See merge request ispconfig/ispconfig3!825
```
  9e96b63b
- Merge branch 'patch-2' into 'master' · e95c9a50
  Till Brehm authored Oct 15, 2018
```
My first translation update

See merge request ispconfig/ispconfig3!826
```
  e95c9a50
- Merge branch 'patch-3' into 'stable-3.1' · 6d28d421
  Till Brehm authored Oct 15, 2018
```
Update apache_ispconfig.vhost.master

See merge request !828
```
  6d28d421
- Update apache_ispconfig.vhost.master · 3b44e5d4
  Jesse Norell authored Oct 15, 2018
  
  3b44e5d4
- Fix 3 syntax errors in Italian lang files · b7794d7d
  Helmo authored Oct 15, 2018
  
  b7794d7d
- Add php syntax check via GitLab CI · d641385b
  Helmo authored Oct 15, 2018
  
  d641385b
- My first translation update · ab6cf3fc
  Helmo authored Oct 05, 2018
  
  ab6cf3fc
- Do not show db or site quota when the sites module is not active · baf703b9
  Helmo authored Oct 15, 2018
  
  baf703b9