Commits · master · Michael / ISPConfig 3

Aug 15, 2019
- Merge branch 'undefined' into 'master' · 2f21ecee
  Till Brehm authored Aug 15, 2019
```
Example csv import email script.

See merge request ispconfig/ispconfig3!910
```
  2f21ecee
Aug 14, 2019
- Example csv import email script. · f2df6e17
  Jesse Norell authored Aug 14, 2019
  
  f2df6e17
Jul 01, 2019
- Merge branch 'master' into 'master' · cc7931df
  Till Brehm authored Jul 01, 2019
```
Master

See merge request ispconfig/ispconfig3!895
```
  cc7931df
Jun 30, 2019

Merge branch 'patch-1' into 'master' · 708631d7

Till Brehm authored Jul 01, 2019

Change height select email domain in mail_user_mailbox_edit.htm

See merge request ispconfig/ispconfig3!899

708631d7

Jun 27, 2019
- Change height select email domain in mail_user_mailbox_edit.htm · dddad2fe
  AndyPL authored Jun 27, 2019
  
  dddad2fe
Jun 17, 2019
- Merge branch 'undefined' into 'master' · e0805b6b
  Till Brehm authored Jun 17, 2019
```
Replace wp-auth.conf

See merge request ispconfig/ispconfig3!897
```
  e0805b6b
- Merge branch 'patch-1' into 'master' · e375fa15
  Till Brehm authored Jun 17, 2019
```
Update jail.local to include xmlrpc

See merge request ispconfig/ispconfig3!896
```
  e375fa15
Jun 14, 2019
- Replace wp-auth.conf · 199c0d89
  Pete authored Jun 15, 2019
  
  199c0d89
- Update jail.local · 58ef2d95
  Pete authored Jun 15, 2019
  
  58ef2d95
May 29, 2019
- re-add missing code for last commit · d0dd6702
  Florian Schaal authored May 29, 2019
  
  d0dd6702
May 28, 2019
- show user + ip in dataloghistory · 118ed211
  Florian Schaal authored May 28, 2019
  
  118ed211
May 24, 2019
- datalog-viewer: show parent web-site for deleted cron-jobs, too · a122f6ee
  Florian Schaal authored May 24, 2019
  
  a122f6ee
- Merge branch 'master' into 'master' · a6ce7641
  Till Brehm authored May 24, 2019
```
improve datalog-viewer

See merge request ispconfig/ispconfig3!894
```
  a6ce7641
- add cron to last commit _ datalog-viewer · 46b74480
  Florian Schaal authored May 24, 2019
  
  46b74480
- improve datalog-viewer · 534a6dc0
  Florian Schaal authored May 24, 2019
  
  534a6dc0
Apr 15, 2019

Merge branch 'issue/5290' into 'master' · 72b955c8

Till Brehm authored Apr 15, 2019

Fixes #5290 - Allow Certbot http challenge on nginx behind basic auth

Closes #5290

See merge request ispconfig/ispconfig3!892

72b955c8

Apr 12, 2019
- Fixes #5290 - Allow Certbot http challenge behind basic auth · 5662bd16
  Guillaume Chauvin authored Apr 12, 2019
  
  5662bd16
Apr 04, 2019
- Merge branch 'master' into 'master' · de52e8b8
  Till Brehm authored Apr 04, 2019
```
Add French templates to mail notifications

See merge request ispconfig/ispconfig3!890
```
  de52e8b8
- Add French templates to mail notifications · 41601a5b
  Guillaume Chauvin authored Apr 04, 2019
  
  41601a5b
Mar 21, 2019
- - rspamd fixes · d10c482e
  Marius Burkard authored Mar 21, 2019
  
  d10c482e
Mar 13, 2019
- Merge branch 'shebang' into 'master' · 32122170
  Till Brehm authored Mar 13, 2019
```
Use env in bash scripting shebangs

See merge request ispconfig/ispconfig3!887
```
  32122170
- Use env in bash scripting shebangs · d3ecb3df
  Philipp authored Mar 13, 2019
  
  d3ecb3df
Mar 12, 2019
- Merge branch 'dovecot' into 'master' · a240d361
  Till Brehm authored Mar 12, 2019
```
this avoids a warning in bounce mails and logs

See merge request ispconfig/ispconfig3!886
```
  a240d361
- this avoids a warning in bounce mails and logs · 03d4e1a9
  root authored Mar 11, 2019
  
  03d4e1a9
Mar 05, 2019
- Merge branch 'master' into 'master' · f9fc428b
  Till Brehm authored Mar 05, 2019
```
soap api server bugfix

See merge request ispconfig/ispconfig3!880
```
  f9fc428b
- soap api server bugfix · 607d3643
  root authored Mar 05, 2019
```
fix invalid return of mirror id
```
  607d3643
Feb 26, 2019
- Merge branch 'issue/5254' into 'master' · 801e02f7
  Till Brehm authored Feb 26, 2019
```
Cronjob locking not working properly

Closes #5254

See merge request ispconfig/ispconfig3!876
```
  801e02f7
- fixes #5254 · 42e7c387
  Thomas Heller authored Feb 26, 2019
  
  42e7c387
- Merge branch 'master' into 'master' · 80579215
  Till Brehm authored Feb 26, 2019
```
update caa

See merge request ispconfig/ispconfig3!875
```
  80579215
- update caa · ba507131
  Florian Schaal authored Feb 26, 2019
  
  ba507131
Jan 31, 2019

Merge branch 'master' into 'master' · 876f4a00

Till Brehm authored Jan 31, 2019

Update wp-auth.conf to include some commonly attacked WordPress URLs

See merge request ispconfig/ispconfig3!868

876f4a00

Jan 29, 2019
- Update wp-auth.conf to include some commonly attacked WordPress URLs · 396f20a1
  Pete authored Jan 29, 2019
  
  396f20a1
Jan 28, 2019
- Merge branch 'patch-min_password_length' into 'master' · e6d7649c
  Till Brehm authored Jan 28, 2019
```
Create a util function to remove duplication

See merge request ispconfig/ispconfig3!866
```
  e6d7649c
Jan 26, 2019
- Create a util function to remove duplication · 6d8d6168
  Helmo authored Jan 26, 2019
  
  6d8d6168
Jan 25, 2019
- Merge branch 'stable-3.1' · e5322cbb
  Marius Burkard authored Jan 25, 2019
  
  e5322cbb
- - fixed update serial on delete RR via remoting · 04d8e6f6
  Marius Burkard authored Jan 25, 2019
```
- reduced duplicate code in dns remoting function
```
  04d8e6f6
- - fixed some rspamd values, removed commented code · 178b34eb
  Marius Burkard authored Jan 25, 2019
  
  178b34eb
Jan 19, 2019

- fixed vhost settings for nginx · cda177a2

Marius Burkard authored Jan 19, 2019

- fixed rspamd settings
- fixed errors in webserver plugin
- fixed error in dkim domain handling

cda177a2

Jan 18, 2019
- Merge branch 'feature/5223-powerdns-4-support' into 'stable-3.1' · ddef5140
  Till Brehm authored Jan 18, 2019
```
Add support for powerdns 4.x, fixes #5223

See merge request ispconfig/ispconfig3!865
```
  ddef5140
Jan 17, 2019
- Add support for powerdns 4.x, fixes #5223 · 3f9c6a3a
  Webslice authored Jan 17, 2019
  
  3f9c6a3a