Commits · c704e8c44684289e75c13e8d2b086dce6dfbf41d · Hj Ahmad Rasyid Hj Ismail / ISPConfig 3

Jun 09, 2020
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · c704e8c4
  Florian Schaal authored Jun 09, 2020
  
  c704e8c4
- allow the same name for every directive snippets type (Implemets #5631 ) · 5ffe9d88
  Florian Schaal authored Jun 09, 2020
  
  5ffe9d88
- Merge branch 'stable-3.1' into 'stable-3.1' · 90e6967b
  Marius Burkard authored Jun 09, 2020
```
purge trash and junk (Implements #5634)

See merge request ispconfig/ispconfig3!1015
```
  90e6967b
- - improved lint script · c8db76b6
  Marius Burkard authored Jun 09, 2020
  
  c8db76b6
- - added custom ci lint script · 22819ea8
  Marius Burkard authored Jun 09, 2020
  
  22819ea8
- purge trash and junk (Implements #5634 ) · c40524c4
  Florian Schaal authored Jun 09, 2020
  
  c40524c4
- - changed settings for phplint · 20e52c33
  Marius Burkard authored Jun 09, 2020
  
  20e52c33
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · d1b03a49
  Marius Burkard authored Jun 09, 2020
  
  d1b03a49
- - change phplint settings · e58600a6
  Marius Burkard authored Jun 09, 2020
  
  e58600a6
- Merge branch 'stable-3.1' into 'stable-3.1' · 5798d3ba
  Marius Burkard authored Jun 09, 2020
```
Backport of !925

See merge request !1014
```
  5798d3ba
- Merge branch '4109' into 'stable-3.1' · a660aeb2
  Marius Burkard authored Jun 09, 2020
```
default php-fpm to use ondemand mode

See merge request ispconfig/ispconfig3!1012
```
  a660aeb2
- Merge remote-tracking branch 'main/stable-3.1' into 4109 · c29062c5
  Marius Burkard authored Jun 09, 2020
  
  c29062c5
- Merge remote-tracking branch 'main/stable-3.1' into stable-3.1 · 62f242a9
  Marius Burkard authored Jun 09, 2020
  
  62f242a9
- - missing fix for !1010 · b84d1a66
  Marius Burkard authored Jun 09, 2020
  
  b84d1a66
- - backport for MR !925 · e3586dea
  Marius Burkard authored Jun 09, 2020
  
  e3586dea
- Merge remote-tracking branch 'main/stable-3.1' into stable-3.1 · 789d72f3
  Marius Burkard authored Jun 09, 2020
  
  789d72f3
- Merge remote-tracking branch 'main/stable-3.1' into 4109 · 41e5c9a2
  Marius Burkard authored Jun 09, 2020
  
  41e5c9a2
- Update .gitlab-ci.yml · d19d4a7f
  Marius Burkard authored Jun 09, 2020
  
  d19d4a7f
- Update upd_dev_collection.sql · 6083f0f3
  Marius Burkard authored Jun 09, 2020
  
  6083f0f3
- - fixed language syntax errors from !1010 · cbc92c24
  Marius Burkard authored Jun 09, 2020
  
  cbc92c24
- - add checker for mr · 66353106
  Marius Burkard authored Jun 09, 2020
  
  66353106
Jun 08, 2020
- default php-fpm to use ondemand mode · c3f4ffcc
  Jesse Norell authored Jun 08, 2020
  
  c3f4ffcc
- Merge branch 'sectigo-caa' into 'stable-3.1' · 00688520
  Till Brehm authored Jun 08, 2020
```
Rename Comodo to "Sectigo / Comodo CA"

See merge request ispconfig/ispconfig3!1011
```
  00688520
- Rename Comodo to "Sectigo / Comodo CA" · 857b4eaa
  Thom authored Jun 08, 2020
  
  857b4eaa
- Merge branch 'mailuser-menus' into 'stable-3.1' · f775f1cc
  Till Brehm authored Jun 08, 2020
```
Remove double/empty titles and descriptions for mailusers

See merge request !1005
```
  f775f1cc
- Merge branch '5629' into 'stable-3.1' · 73e3570d
  Till Brehm authored Jun 08, 2020
```
update sql patch instructions.

See merge request ispconfig/ispconfig3!1006
```
  73e3570d
- Merge branch 'stable-3.1' into '5629' · 9dda500f
  Till Brehm authored Jun 08, 2020
```
# Conflicts:
#   install/sql/README.txt
```
  9dda500f
- Merge branch 'add-some-translations' into 'stable-3.1' · 67bc2c3c
  Till Brehm authored Jun 08, 2020
```
Translation enhancements

See merge request ispconfig/ispconfig3!1010
```
  67bc2c3c
Jun 07, 2020
- Merge branch 'stable-3.1' into 'add-some-translations' · 789153a7
  Thom authored Jun 08, 2020
```
# Conflicts:
#   interface/web/admin/form/users.tform.php
```
  789153a7
- Remove description · 58102c14
  Thom authored Jun 08, 2020
  
  58102c14
- New translations · d4b17070
  Thom authored Jun 07, 2020
  
  d4b17070
- - migrated changes from interface to server · fab638d9
  Marius Burkard authored Jun 07, 2020
  
  fab638d9
Jun 06, 2020
- Added translation function for User (#2410) · 870f610b
  Thom authored Jun 07, 2020
  
  870f610b
- Changed Server Config translation · 63e091f1
  Thom authored Jun 06, 2020
  
  63e091f1
- Added translation function for Server Config (#2410) · cab126e6
  Thom authored Jun 06, 2020
  
  cab126e6
- Add translation for Zone File Import (#4311) · 413bc63b
  Thom authored Jun 06, 2020
  
  413bc63b
- Added translations from #4962 · 39c195b8
  Thom authored Jun 06, 2020
  
  39c195b8
- Added translations from #5477 · c798155c
  Thom authored Jun 06, 2020
  
  c798155c
Jun 04, 2020
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · a8595497
  Till Brehm authored Jun 04, 2020
  
  a8595497
- Improved cron debug script · b34b1ad5
  Till Brehm authored Jun 04, 2020
  
  b34b1ad5