Commits · e10bb13c983a8d7bc79bfc319d3b7854d80f5602 · Jonas / ISPConfig 3

25 Oct, 2018 8 commits
- 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 ispconfig/ispconfig3!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 ispconfig/ispconfig3!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
12 Oct, 2018 1 commit

Merge branch 'patch-3' into 'stable-3.1' · 74a297a2

Till Brehm authored Oct 12, 2018

Add Content-Security-Policy header and friends.

See merge request ispconfig/ispconfig3!824

74a297a2

11 Oct, 2018 3 commits
- Add Content-Security-Policy header and friends. · b5dd05ad
  Jesse Norell authored Oct 11, 2018
  
  b5dd05ad
- Merge branch 'revert-ca7c77d9' into 'stable-3.1' · 06cf8f6e
  Till Brehm authored Oct 11, 2018
```
Revert "Update apache_ispconfig.vhost.master"

See merge request ispconfig/ispconfig3!823
```
  06cf8f6e
- Revert "Update apache_ispconfig.vhost.master" · c825a736
  Till Brehm authored Oct 11, 2018
```
This reverts commit ca7c77d9
```
  c825a736
10 Oct, 2018 3 commits
- Merge branch 'patch-3' into 'stable-3.1' · eada920c
  Till Brehm authored Oct 10, 2018
```
Mulitple HSTS headers are not allowed, should either unset before adding new, or set conditionally.

See merge request ispconfig/ispconfig3!822
```
  eada920c
- Update apache_ispconfig.vhost.master · ca7c77d9
  Jesse Norell authored Oct 10, 2018
  
  ca7c77d9
- Mulitple HSTS headers are not allowed, should either unset before adding new, or set conditionally. · 36684dcf
  Jesse Norell authored Oct 10, 2018
  
  36684dcf
21 Sep, 2018 7 commits
- Merge branch 'patch-1' into 'master' · 3f8c72ef
  Till Brehm authored Sep 21, 2018
```
Various minor code cleanups

See merge request ispconfig/ispconfig3!820
```
  3f8c72ef
- Correct warning message · bf7714a5
  Helmo authored Sep 21, 2018
  
  bf7714a5
- Cleanup whitespace · b73e9782
  Helmo authored Mar 09, 2018
  
  b73e9782
- correct index path · f112fd1a
  Helmo authored Feb 17, 2018
  
  f112fd1a
- fix typo · b0b62599
  Helmo authored Feb 17, 2018
  
  b0b62599
- Set a descriptive name for the return vanlue of mail_user_add(); · a8d1dd21
  Helmo authored Feb 17, 2018
  
  a8d1dd21
- Remove old duplicate example, it is an old copy of sites_database_add.php · 741a0891
  Helmo authored Jan 31, 2018
  
  741a0891
17 Sep, 2018 2 commits
- Fixed #5128 Bug in password strength meter · e2465bd7
  Till Brehm authored Sep 17, 2018
  
  e2465bd7
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · 400986dc
  Till Brehm authored Sep 17, 2018
  
  400986dc
12 Sep, 2018 2 commits
- Merge branch 'stable-3.1' into 'stable-3.1' · 98a32a22
  Till Brehm authored Sep 12, 2018
```
fixed sql-query for master-server for mail-backups

See merge request ispconfig/ispconfig3!819
```
  98a32a22
- fixed sql-query for master-server for mail-backups · a27954c5
  Florian Schaal authored Sep 12, 2018
  
  a27954c5
11 Sep, 2018 3 commits
- Merge branch 'stable-3.1' into 'stable-3.1' · 762a62a4
  Till Brehm authored Sep 11, 2018
```
merge db_mysql.inc.php from server/ and interface/

See merge request ispconfig/ispconfig3!815
```
  762a62a4
- Merge branch 'stable-3.1' into 'stable-3.1' · b5d44399
  Till Brehm authored Sep 11, 2018
```
Update monitor_tools.inc.php

See merge request ispconfig/ispconfig3!818
```
  b5d44399
- Update monitor_tools.inc.php · 96f59e61
  Olivier BOUMATI authored Sep 11, 2018
```
Preserve body structure in send_notification_email
```
  96f59e61
07 Sep, 2018 1 commit
- Allow single letter domain not tld, corrected last commit. · b361d13b
  Till Brehm authored Sep 07, 2018
  
  b361d13b