Commits · 789153a7b979efcab66139fc69219fd40298e7d5 · Vítězslav Dvořák / ISPConfig 3

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
Jun 03, 2020
- - updated README for incremental sql files · 8e584ee8
  Marius Burkard authored Jun 03, 2020
  
  8e584ee8
May 29, 2020
- Merge branch 'fix/backup-web' into 'stable-3.1' · f42ab5a6
  Till Brehm authored May 29, 2020
```
Fix backup of web files

See merge request ispconfig/ispconfig3!1003
```
  f42ab5a6
- [fix] correct default format detection · 0fb97725
  Ramil Valitov authored May 29, 2020
  
  0fb97725
May 28, 2020
- Merge branch 'stable-3.1' into 'stable-3.1' · e69a5b3f
  Till Brehm authored May 28, 2020
```
Stable 3.1

See merge request ispconfig/ispconfig3!950
```
  e69a5b3f
- Merge branch 'patch-allow-redirect-cron' into 'stable-3.1' · b1657076
  Till Brehm authored May 28, 2020
```
Do not add redirection when the command already does that itself.

See merge request ispconfig/ispconfig3!970
```
  b1657076
- Merge branch 'patch-jk-ssl-certs' into 'stable-3.1' · ad23384f
  Till Brehm authored May 28, 2020
```
Include CA certs in jailkit chroot, fixes #4878

See merge request ispconfig/ispconfig3!989
```
  ad23384f
- Merge branch 'feature/backup-formats' into 'stable-3.1' · 872d9e87
  Till Brehm authored May 28, 2020
```
New code for backups with lots of new features

See merge request ispconfig/ispconfig3!980
```
  872d9e87
- New code for backups with lots of new features · 8bc6a8c3
  Ramil Valitov authored May 28, 2020 and Till Brehm committed May 28, 2020
  
  8bc6a8c3
- Merge branch 'remove-double-or-empty-titles' into 'stable-3.1' · 6d2f77c6
  Till Brehm authored May 28, 2020
```
Remove double or empty titles

See merge request ispconfig/ispconfig3!1001
```
  6d2f77c6
- Merge branch 'missing-translations-system-config' into 'stable-3.1' · e2c5aadd
  Till Brehm authored May 28, 2020
```
Add missing translations for IPv4 mapping

See merge request ispconfig/ispconfig3!1002
```
  e2c5aadd
May 27, 2020
- Added missing lines for title and desc · f7e8f09b
  Thom authored May 27, 2020
  
  f7e8f09b
- Removed double / empty titles and descriptions · 517e5076
  Thom authored May 27, 2020
  
  517e5076
- Removed double / empty titles and descriptions · 499745fd
  Thom authored May 27, 2020
  
  499745fd
- Removed double / empty titles and descriptions · d4751a42
  Thom authored May 27, 2020
  
  d4751a42
- Removed double / empty titles and descriptions · 86e85a33
  Thom authored May 27, 2020
  
  86e85a33
- Removed double / empty titles and descriptions · e7fadf85
  Thom authored May 27, 2020
  
  e7fadf85
- Fixed: #5622 Do not display user switcher to client_id 0 users. · 666d1df8
  Till Brehm authored May 27, 2020
  
  666d1df8
- Merge branch 'ssh-auth-options' into 'stable-3.1' · 61d7ba2d
  Till Brehm authored May 27, 2020
```
SSH authentication options

See merge request ispconfig/ispconfig3!1000
```
  61d7ba2d
May 26, 2020
- Changed the class on accident, revert · 6281ea73
  Thom authored May 27, 2020
  
  6281ea73
- Removed double or empty titles / descriptions · b7cb06c0
  Thom authored May 27, 2020
  
  b7cb06c0
- Improved page title · ad0ffdf6
  Thom authored May 27, 2020
  
  ad0ffdf6
- Removed double titles or descriptions · b6c42d0e
  Thom authored May 27, 2020
  
  b6c42d0e
- Added: Field validation (do not allow key/password-field, if only password/key is allowed) · 734277e2
  Ninos authored May 26, 2020
  
  734277e2
- Added: SSH authentication option (password, key, both) · 15ae954a
  Ninos authored May 26, 2020
  
  15ae954a
- Merge branch 'server-select-fix' into 'stable-3.1' · 2fa5ed2c
  Till Brehm authored May 26, 2020
```
Server select fix

See merge request ispconfig/ispconfig3!999
```
  2fa5ed2c
- Update custom_datasource.inc.php · 9e1fe1b5
  Till Brehm authored May 26, 2020
  
  9e1fe1b5
- Merge branch 'ispcmail' into 'stable-3.1' · bfc5f331
  Till Brehm authored May 26, 2020
```
fix various ispcmail issues.  fixes #5620

See merge request !993
```
  bfc5f331
- Server select fix (fixes #4725 ) · 4d622544
  Thom authored May 26, 2020
  
  4d622544