Commits · aa1eed46b3d03746640a73db6df7d163ba036df3 · ISPConfig / ISPConfig 3

Mar 30, 2020
- Feature/backup copies · aa1eed46
  Ramil Valitov authored Mar 30, 2020 and Marius Burkard committed Mar 30, 2020
  
  aa1eed46
Mar 20, 2020
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · 2cc5f036
  Marius Burkard authored Mar 20, 2020
  
  2cc5f036
- - escape database name on GRANT · 8400a46c
  Marius Burkard authored Mar 20, 2020
  
  8400a46c
Mar 04, 2020
- Merge branch '3.1_proxy_protocol' into 'stable-3.1' · d4e9f1b5
  Marius Burkard authored Mar 04, 2020
```
Enable Proxy Protocol - Patch for 3.1

See merge request !933
```
  d4e9f1b5
- Update ispconfig3.sql · 2597d721
  Marius Burkard authored Mar 04, 2020
  
  2597d721
- Update upd_dev_collection.sql · c100d85d
  Marius Burkard authored Mar 04, 2020
  
  c100d85d
- Update upd_dev_collection.sql · c97f8313
  Marius Burkard authored Mar 04, 2020
  
  c97f8313
- Delete upd_0089.sql · 54302cf5
  Marius Burkard authored Mar 04, 2020
  
  54302cf5
- Update upd_0089.sql - we do not allow merges into upd_xxx files. · bc713be2
  Marius Burkard authored Mar 04, 2020
  
  bc713be2
- Update nginx_plugin.inc.php (add port check for proxy) · fa5f1365
  Marius Burkard authored Mar 04, 2020
  
  fa5f1365
- Merge branch 'feature/fix-spf-name-error-regex-translation' into 'stable-3.1' · f85e3775
  Marius Burkard authored Mar 04, 2020
```
Fix spf name error regex translation

See merge request ispconfig/ispconfig3!971
```
  f85e3775
- Fix spf name error regex translation · 814cfb81
  Webslice authored Mar 04, 2020 and Marius Burkard committed Mar 04, 2020
  
  814cfb81
Mar 02, 2020
- Merge branch 'feature/hide-default-php-version' into 'stable-3.1' · 846a9a15
  Marius Burkard authored Mar 02, 2020
```
Hide default php version

See merge request ispconfig/ispconfig3!960
```
  846a9a15
- Hide default php version · 37534873
  Webslice authored Mar 02, 2020 and Marius Burkard committed Mar 02, 2020
  
  37534873
- Merge branch 'patch-skip-irrelevant-dashlets' into 'stable-3.1' · 0113a3f3
  Marius Burkard authored Mar 02, 2020
```
Show harddisk and database quota dashlet only when user has access

See merge request ispconfig/ispconfig3!964
```
  0113a3f3
- Merge branch 'bugfix/various-spf-editing-fixes' into 'stable-3.1' · 53c84aa8
  Marius Burkard authored Mar 02, 2020
```
Fix SPF multiple records validation

See merge request !969
```
  53c84aa8
- Fix SPF multiple records validation · ebdc1c77
  Webslice authored Mar 02, 2020 and Marius Burkard committed Mar 02, 2020
  
  ebdc1c77
- Merge branch 'patch-check-correct-module' into 'stable-3.1' · 0589b0b2
  Marius Burkard authored Mar 02, 2020
```
Check access for backup stats

See merge request !965
```
  0589b0b2
- Merge branch 'bugfix/fix-php-warning-when-adding-empty-spf' into 'stable-3.1' · 263a5a22
  Marius Burkard authored Mar 02, 2020
```
Fix php warning when adding empty spf

See merge request ispconfig/ispconfig3!967
```
  263a5a22
- Fix php warning when adding empty spf · 8cb82906
  Webslice authored Mar 02, 2020 and Marius Burkard committed Mar 02, 2020
  
  8cb82906
- Merge branch 'bugfix/5545-pw-reset-is-always-english' into 'stable-3.1' · 01bf506b
  Marius Burkard authored Mar 02, 2020
```
#5545 pw reset is always english

See merge request ispconfig/ispconfig3!966
```
  01bf506b
- #5545 pw reset is always english · 3d4981e3
  Webslice authored Mar 02, 2020 and Marius Burkard committed Mar 02, 2020
  
  3d4981e3
- Merge branch 'bugfix/5523-deleting-qa-triggers-csrf-protection' into 'stable-3.1' · 2c03df2a
  Marius Burkard authored Mar 02, 2020
```
Add CSRF key and token to FAQ delete links

See merge request !968
```
  2c03df2a
- Add CSRF key and token to FAQ delete links · 53e799ec
  Webslice authored Mar 02, 2020 and Marius Burkard committed Mar 02, 2020
  
  53e799ec
Feb 27, 2020
- Merge branch 'feature/5329-spf-wizard-for-txt-records' into 'stable-3.1' · 5a5dc30c
  Marius Burkard authored Feb 27, 2020
```
Allow hostname in SPF wizard

See merge request ispconfig/ispconfig3!961
```
  5a5dc30c
- Allow hostname in SPF wizard · 9f38e059
  Webslice authored Feb 27, 2020 and Marius Burkard committed Feb 27, 2020
  
  9f38e059
- Merge branch 'task/icon' into 'stable-3.1' · 245ab379
  Marius Burkard authored Feb 27, 2020
```
Add favicon, app, color & tile

See merge request ispconfig/ispconfig3!956
```
  245ab379
- Add favicon, app, color & tile · 51309b17
  Xaver authored Feb 27, 2020 and Marius Burkard committed Feb 27, 2020
  
  51309b17
- Merge branch 'patch-allow_send_as' into 'stable-3.1' · 7270b2c0
  Marius Burkard authored Feb 27, 2020
```
Document allow_send_ase and greylisting, #5536

See merge request !959
```
  7270b2c0
- Merge branch 'task/non-deprecated-ci' into 'stable-3.1' · a95ef4cf
  Marius Burkard authored Feb 27, 2020
```
Switch to recommanded CI container

See merge request ispconfig/ispconfig3!957
```
  a95ef4cf
- Switch to recommanded CI container · 9735af19
  Xaver authored Feb 27, 2020 and Marius Burkard committed Feb 27, 2020
  
  9735af19
- Merge branch 'feature/relative-paths-for-login-as' into 'stable-3.1' · 2db3af76
  Marius Burkard authored Feb 27, 2020
```
Relative paths for login-as functionality

See merge request !962
```
  2db3af76
- Relative paths for login-as functionality · c1dba41d
  Webslice authored Feb 27, 2020 and Marius Burkard committed Feb 27, 2020
  
  c1dba41d
Feb 26, 2020
- Check the Backupfunction available setting when showing Backup Stats · e82b8791
  Helmo authored Feb 26, 2020
  
  e82b8791
- Check permission to the mail instead of the sites module · 9be213cf
  Helmo authored Feb 26, 2020
  
  9be213cf
- Show harddisk and database quota dashlet only when user has access · cf593c7d
  Helmo authored Feb 26, 2020
  
  cf593c7d
Feb 21, 2020
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · 89d62098
  Marius Burkard authored Feb 21, 2020
  
  89d62098
- - fixes #5541 · 7fca6989
  Marius Burkard authored Feb 21, 2020
  
  7fca6989
Feb 18, 2020
- Document allow_send_ase and greylisting, #5536 · dec8b545
  Helmo authored Feb 18, 2020
  
  dec8b545
Jan 28, 2020
- Merge branch 'bugfix/mailstats' into 'stable-3.1' · 3c1d0a65
  Till Brehm authored Jan 28, 2020
```
Fix column sorting foer mailbox quota

See merge request ispconfig/ispconfig3!951
```
  3c1d0a65