Commits · d933f1e2d89f90d5a064f3b79591d5b7391ac84a · Óscar Marcos / ISPConfig 3

May 29, 2018

Merge branch 'master' into 'master' · d933f1e2

Till Brehm authored May 29, 2018

Optimized prosody configuration and full OMEMO support

See merge request ispconfig/ispconfig3!785

d933f1e2

May 25, 2018
- - merge conflicts resolved · 04272058
  Marius Burkard authored May 25, 2018
  
  04272058
- Merge branch 'stable-3.1' · e32c871f
  Marius Burkard authored May 25, 2018
  
  e32c871f
May 24, 2018
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · 02fde680
  Till Brehm authored May 24, 2018
  
  3.1.12
  
  02fde680
- Make update_acl field visible to admins only in dns SOA. · 08c493a6
  Till Brehm authored May 24, 2018
  
  08c493a6
May 23, 2018
- - backported some more code from old vlogger · 4188c227
  Marius Burkard authored May 23, 2018
  
  4188c227
- - removed debugger from vlogger · 5b051c99
  Marius Burkard authored May 23, 2018
  
  5b051c99
- - added fixes from previous commits · 0c432660
  Marius Burkard authored May 23, 2018
  
  0c432660
- Merged language files. · 9c51ab5c
  Till Brehm authored May 23, 2018
  
  9c51ab5c
- Moved SQL queries to upd_0086.sql · f3d9f1c6
  Till Brehm authored May 23, 2018
  
  f3d9f1c6
- Add access and error log controls for nginx servers. · 2774cc7f
  Till Brehm authored May 23, 2018
```
Add description text for logging options.
```
  2774cc7f
- Added logging type detection for the other distributions. · 5ce5edbe
  Till Brehm authored May 23, 2018
  
  5ce5edbe
- Fixed log type detection in installer. · 4bce508c
  Till Brehm authored May 23, 2018
  
  4bce508c
- Add extended Log file controls for apache. · 655547b8
  Till Brehm authored May 23, 2018
  
  655547b8
May 22, 2018
- Add IP anonymization option -p to vlogger. · 442f2576
  Till Brehm authored May 22, 2018
  
  442f2576
- Implemented #5047 Add support for utf8mb4 charset in MySQL database form · 9e00bf08
  Till Brehm authored May 22, 2018
  
  9e00bf08
- Implemented #4978 Changing regex for dns_ns to allow delegating LE requests to seperate nameservers · 0f50bdbf
  Till Brehm authored May 22, 2018
  
  0f50bdbf
- #4977 stats Folder created even when Statistics set to none · 6088a9c6
  Till Brehm authored May 22, 2018
  
  6088a9c6
- Implemented #4967 Enable proxy rewrite support [P] for apache servers · bb00dc2d
  Till Brehm authored May 22, 2018
  
  bb00dc2d
May 20, 2018
- Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 · 8f68c0e4
  Michael Fürmann authored May 20, 2018
  
  8f68c0e4
- Optimized prosody configuration for full conversations.im feature... · 894dbac3
  Michael Fürmann authored May 20, 2018
```
Optimized prosody configuration for full conversations.im feature compartibility including full OMEMO support
```
  894dbac3
May 18, 2018
- Merge branch 'stable-3.1' into 'stable-3.1' · ed6798bc
  Marius Burkard authored May 18, 2018
```
update logrotate

See merge request ispconfig/ispconfig3!784
```
  ed6798bc
- fixed last commit · dc97693e
  Florian Schaal authored May 18, 2018
  
  dc97693e
- update logrotate · f6d3c92b
  Florian Schaal authored May 18, 2018
  
  f6d3c92b
- Merge branch 'stable-3.1' into 'stable-3.1' · 3dfecb0a
  Till Brehm authored May 18, 2018
```
Stable 3.1

See merge request ispconfig/ispconfig3!783
```
  3dfecb0a
- daily rotate for ispconfig-logs (ispconfig.log, cron.log, auth.log) up to 10 days · fe8ea3f1
  Florian Schaal authored May 18, 2018
  
  fe8ea3f1
- Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1 · ed1073fe
  Florian Schaal authored May 18, 2018
  
  ed1073fe
- rotate error.log daily (Fixes #5003) · 10eb2f3b
  Florian Schaal authored May 18, 2018
  
  10eb2f3b
May 16, 2018
- Merge branch 'patch-2' into 'stable-3.1' · caeab8c0
  Till Brehm authored May 16, 2018
```
update_record_permissions() isn't callable via API as it has no session_id in its params

See merge request ispconfig/ispconfig3!780
```
  caeab8c0
- Merge branch 'stable-3.1' into 'stable-3.1' · 1ebaacfa
  Till Brehm authored May 16, 2018
```
fixed checkbox in dmarc template

See merge request ispconfig/ispconfig3!781
```
  1ebaacfa
- Merge branch 'master' into 'master' · 4382fdce
  Till Brehm authored May 16, 2018
```
Typo in the language files where delivered was misspelled delievered

See merge request ispconfig/ispconfig3!782
```
  4382fdce
- Update tr_dns_soa.lng - typo in dnssec_wanted_info · 85fdf1b3
  Tristan Scott authored May 16, 2018
  
  85fdf1b3
- Update sk_dns_soa.lng - typo in dnssec_wanted_info · 97b128a2
  Tristan Scott authored May 16, 2018
  
  97b128a2
- Update se_dns_soa.lng - typo in dnssec_wanted_info · 760fb290
  Tristan Scott authored May 16, 2018
  
  760fb290
- Update ro_dns_soa.lng - typo in dnssec_wanted_info · 66de305f
  Tristan Scott authored May 16, 2018
  
  66de305f
- Update pt_dns_soa.lng - typo in dnssec_wanted_info · 7e84f9f6
  Tristan Scott authored May 16, 2018
  
  7e84f9f6
- Update pl_dns_soa.lng - typo in dnssec_wanted_info · 2c6452f1
  Tristan Scott authored May 16, 2018
  
  2c6452f1
- Update nl_dns_soa.lng - typo in dnssec_wanted_info · 37ce7dd0
  Tristan Scott authored May 16, 2018
  
  37ce7dd0
- Update ja_dns_soa.lng - typo in dnssec_wanted_info · 874e9f54
  Tristan Scott authored May 16, 2018
  
  874e9f54
- Update it_dns_soa.lng - typo in dnssec_wanted_info · e095528d
  Tristan Scott authored May 16, 2018
  
  e095528d