ISPConfig 3:master commits
https://git.ispconfig.org/webslice/ispconfig3/-/commits/master
2019-08-15T11:03:19+02:00
https://git.ispconfig.org/webslice/ispconfig3/-/commit/2f21ecee2829d2354d9834a9529e403da83bbc6c
Merge branch 'undefined' into 'master'
2019-08-15T11:03:19+02:00
Till Brehm
tbrehm@ispconfig.org
Example csv import email script.
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/910" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!910" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1194" data-project-path="ispconfig/ispconfig3" data-iid="910" data-container="body" data-placement="top" title="Example csv import email script." class="gfm gfm-merge_request">ispconfig/ispconfig3!910</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/f2df6e1707ae8a78e11d0dbc6cbe239367c06515
Example csv import email script.
2019-08-14T23:22:00+02:00
Jesse Norell
jesse@kci.net
https://git.ispconfig.org/webslice/ispconfig3/-/commit/cc7931dffaf111a5a1221531319b31de5bf46058
Merge branch 'master' into 'master'
2019-07-01T09:53:44+02:00
Till Brehm
tbrehm@ispconfig.org
Master
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/895" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!895" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1142" data-project-path="ispconfig/ispconfig3" data-iid="895" data-container="body" data-placement="top" title="Master" class="gfm gfm-merge_request">ispconfig/ispconfig3!895</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/708631d724974a5a69ae74d49a9505152bcc1d49
Merge branch 'patch-1' into 'master'
2019-07-01T01:07:33+02:00
Till Brehm
tbrehm@ispconfig.org
Change height select email domain in mail_user_mailbox_edit.htm
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/899" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!899" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1154" data-project-path="ispconfig/ispconfig3" data-iid="899" data-container="body" data-placement="top" title="Change height select email domain in mail_user_mailbox_edit.htm" class="gfm gfm-merge_request">ispconfig/ispconfig3!899</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/dddad2fe38ddf8f286e4882e1ff4d65a57fde0fa
Change height select email domain in mail_user_mailbox_edit.htm
2019-06-27T12:49:03+02:00
AndyPL
as@adminz.eu
https://git.ispconfig.org/webslice/ispconfig3/-/commit/e0805b6bfecb95d59445fde9ba0726361fdb2145
Merge branch 'undefined' into 'master'
2019-06-17T07:55:45+02:00
Till Brehm
tbrehm@ispconfig.org
Replace wp-auth.conf
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/897" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!897" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1149" data-project-path="ispconfig/ispconfig3" data-iid="897" data-container="body" data-placement="top" title="Replace wp-auth.conf" class="gfm gfm-merge_request">ispconfig/ispconfig3!897</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/e375fa1509d1105e1511e6bf463aabf71174008d
Merge branch 'patch-1' into 'master'
2019-06-17T07:55:33+02:00
Till Brehm
tbrehm@ispconfig.org
Update jail.local to include xmlrpc
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/896" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!896" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1148" data-project-path="ispconfig/ispconfig3" data-iid="896" data-container="body" data-placement="top" title="Update jail.local to include xmlrpc" class="gfm gfm-merge_request">ispconfig/ispconfig3!896</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/199c0d896911ae93b439e1af215b2fde22f2dafa
Replace wp-auth.conf
2019-06-15T01:57:38+02:00
Pete
p.ohm@networksec.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/58ef2d95ea0a1b3578d4c31edae1f66142471d5b
Update jail.local
2019-06-15T01:55:24+02:00
Pete
p.ohm@networksec.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/d0dd6702696a45aebbd66b7136e17d1f9b48fc5f
re-add missing code for last commit
2019-05-29T08:40:52+02:00
Florian Schaal
info@schaal-24.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/118ed21100452d99c4cfb47d48b5f4581b54fa40
show user + ip in dataloghistory
2019-05-28T11:56:20+02:00
Florian Schaal
info@schaal-24.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/a122f6eed68d82cf5b150cafa555b6ef238ef861
datalog-viewer: show parent web-site for deleted cron-jobs, too
2019-05-24T17:30:27+02:00
Florian Schaal
info@schaal-24.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/a6ce76410b4dd74e699ad0a0050449a9edabf2be
Merge branch 'master' into 'master'
2019-05-24T15:41:52+02:00
Till Brehm
tbrehm@ispconfig.org
improve datalog-viewer
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/894" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!894" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1141" data-project-path="ispconfig/ispconfig3" data-iid="894" data-container="body" data-placement="top" title="improve datalog-viewer" class="gfm gfm-merge_request">ispconfig/ispconfig3!894</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/46b74480809a224464a95cead5d722137d71bb2f
add cron to last commit _ datalog-viewer
2019-05-24T13:04:02+02:00
Florian Schaal
info@schaal-24.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/534a6dc06eec9b5eeaf5eea89499db1b9d3c999f
improve datalog-viewer
2019-05-24T12:15:51+02:00
Florian Schaal
info@schaal-24.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/72b955c836efa14fe60a291192b568c6095dc8e2
Merge branch 'issue/5290' into 'master'
2019-04-15T15:00:39+02:00
Till Brehm
tbrehm@ispconfig.org
Fixes #5290 - Allow Certbot http challenge on nginx behind basic auth
Closes #5290
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/892" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!892" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1125" data-project-path="ispconfig/ispconfig3" data-iid="892" data-container="body" data-placement="top" title="Fixes #5290 - Allow Certbot http challenge on nginx behind basic auth" class="gfm gfm-merge_request">ispconfig/ispconfig3!892</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/5662bd16b3df57d39c4ed0b18f8a5722d9cc0650
Fixes #5290 - Allow Certbot http challenge behind basic auth
2019-04-12T20:33:37+02:00
Guillaume Chauvin
{ID}+{username}@users.noreply.github.com
https://git.ispconfig.org/webslice/ispconfig3/-/commit/de52e8b8fd4b62c13c9f5569abaeb5c9318f7fe5
Merge branch 'master' into 'master'
2019-04-04T15:01:55+02:00
Till Brehm
tbrehm@ispconfig.org
Add French templates to mail notifications
See merge request ispconfig/ispconfig3!890
https://git.ispconfig.org/webslice/ispconfig3/-/commit/41601a5b5013a1ddc047c895798e83123a65d0fb
Add French templates to mail notifications
2019-04-04T14:22:56+02:00
Guillaume Chauvin
{ID}+{username}@noreply.gitlab.com
https://git.ispconfig.org/webslice/ispconfig3/-/commit/d10c482eef6eced3cf2cc8b13821099ec9ab6f7c
- rspamd fixes
2019-03-21T17:44:14+01:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/32122170936ba27e3d69099d8b63f425cf726e90
Merge branch 'shebang' into 'master'
2019-03-13T18:01:34+01:00
Till Brehm
tbrehm@ispconfig.org
Use env in bash scripting shebangs
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/887" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!887" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1099" data-project-path="ispconfig/ispconfig3" data-iid="887" data-container="body" data-placement="top" title="Use env in bash scripting shebangs" class="gfm gfm-merge_request">ispconfig/ispconfig3!887</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/d3ecb3df52471aad5dfab9e58994ea11506383d3
Use env in bash scripting shebangs
2019-03-13T14:10:26+01:00
Philipp Steinpass
philipp@code-alliance.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/a240d361ad39b9f540936d606ec7c85ca81622cb
Merge branch 'dovecot' into 'master'
2019-03-12T08:14:13+01:00
Till Brehm
tbrehm@ispconfig.org
this avoids a warning in bounce mails and logs
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/886" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!886" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1098" data-project-path="ispconfig/ispconfig3" data-iid="886" data-container="body" data-placement="top" title="this avoids a warning in bounce mails and logs" class="gfm gfm-merge_request">ispconfig/ispconfig3!886</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/03d4e1a9e0da5789bace17f40656ca0e7aaca034
this avoids a warning in bounce mails and logs
2019-03-11T23:52:09-06:00
root
root@localhost.localdomain
https://git.ispconfig.org/webslice/ispconfig3/-/commit/f9fc428b5b37daa1fa5a569e8ad1a62bb1864574
Merge branch 'master' into 'master'
2019-03-05T13:02:35+01:00
Till Brehm
tbrehm@ispconfig.org
soap api server bugfix
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/880" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!880" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1086" data-project-path="ispconfig/ispconfig3" data-iid="880" data-container="body" data-placement="top" title="soap api server bugfix" class="gfm gfm-merge_request">ispconfig/ispconfig3!880</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/607d3643858d70b1a78e91d09e4ac27ccbe428bb
soap api server bugfix
2019-03-05T12:45:13+01:00
root
root@web
fix invalid return of mirror id
https://git.ispconfig.org/webslice/ispconfig3/-/commit/801e02f7111b9d7a784230df34d10e4e40f2a432
Merge branch 'issue/5254' into 'master'
2019-02-26T14:48:01+01:00
Till Brehm
tbrehm@ispconfig.org
Cronjob locking not working properly
Closes #5254
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/876" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!876" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1076" data-project-path="ispconfig/ispconfig3" data-iid="876" data-container="body" data-placement="top" title="Cronjob locking not working properly" class="gfm gfm-merge_request">ispconfig/ispconfig3!876</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/42e7c3876d7da2ad6efca0e4f7da79be9806a226
fixes #5254
2019-02-26T11:40:35+01:00
Thomas Heller
t.heller@timmehosting.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/8057921555f07f057b69c3c21f1d665a601f4fc8
Merge branch 'master' into 'master'
2019-02-26T09:00:25+01:00
Till Brehm
tbrehm@ispconfig.org
update caa
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/875" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!875" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1073" data-project-path="ispconfig/ispconfig3" data-iid="875" data-container="body" data-placement="top" title="update caa" class="gfm gfm-merge_request">ispconfig/ispconfig3!875</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/ba5071311032960e3312179cab1be89b2f1d6455
update caa
2019-02-26T07:53:56+01:00
Florian Schaal
florian@schaal-24.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/876f4a00b218463f2d0a50d0ff61f4e5c0306523
Merge branch 'master' into 'master'
2019-01-31T15:34:15+01:00
Till Brehm
tbrehm@ispconfig.org
Update wp-auth.conf to include some commonly attacked WordPress URLs
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/868" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!868" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1053" data-project-path="ispconfig/ispconfig3" data-iid="868" data-container="body" data-placement="top" title="Update wp-auth.conf to include some commonly attacked WordPress URLs" class="gfm gfm-merge_request">ispconfig/ispconfig3!868</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/396f20a14ced6212337a396d5621576788e2862c
Update wp-auth.conf to include some commonly attacked WordPress URLs
2019-01-29T23:57:52+01:00
Pete
p.ohm@networksec.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/e6d7649c2fe2c72557ecc81e4f33af366ea20956
Merge branch 'patch-min_password_length' into 'master'
2019-01-28T10:45:57+01:00
Till Brehm
tbrehm@ispconfig.org
Create a util function to remove duplication
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/866" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!866" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1049" data-project-path="ispconfig/ispconfig3" data-iid="866" data-container="body" data-placement="top" title="Create a util function to remove duplication" class="gfm gfm-merge_request">ispconfig/ispconfig3!866</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/6d8d61688418cb13b4438c6198594f5c80f0be04
Create a util function to remove duplication
2019-01-26T21:52:36+01:00
Herman van Rink
rink@initfour.nl
https://git.ispconfig.org/webslice/ispconfig3/-/commit/e5322cbbddea673d2281aa334b96f56b6073ecff
Merge branch 'stable-3.1'
2019-01-25T10:16:40+01:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/04d8e6f6e9290755522d915213bd9d6e52b90b6d
- fixed update serial on delete RR via remoting
2019-01-25T10:11:49+01:00
Marius Burkard
m.burkard@pixcept.de
- reduced duplicate code in dns remoting function
https://git.ispconfig.org/webslice/ispconfig3/-/commit/178b34ebb15f33c7327623d249ee0368e3daa391
- fixed some rspamd values, removed commented code
2019-01-25T09:44:15+01:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/webslice/ispconfig3/-/commit/cda177a2484843a20ff013728b856ee1f4e5008c
- fixed vhost settings for nginx
2019-01-19T21:47:04+01:00
Marius Burkard
m.burkard@pixcept.de
- fixed rspamd settings
- fixed errors in webserver plugin
- fixed error in dkim domain handling
https://git.ispconfig.org/webslice/ispconfig3/-/commit/ddef514064c1d51b5abcbd180a23f9e153b4e69d
Merge branch 'feature/5223-powerdns-4-support' into 'stable-3.1'
2019-01-18T09:20:45+01:00
Till Brehm
tbrehm@ispconfig.org
Add support for powerdns 4.x, fixes #5223
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/865" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!865" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1038" data-project-path="ispconfig/ispconfig3" data-iid="865" data-container="body" data-placement="top" title="Add support for powerdns 4.x, fixes #5223" class="gfm gfm-merge_request">ispconfig/ispconfig3!865</a>
https://git.ispconfig.org/webslice/ispconfig3/-/commit/3f9c6a3a929694715d756e023de4447de554e4c4
Add support for powerdns 4.x, fixes #5223
2019-01-17T20:16:53+01:00
Webslice
webslice@bixels.nl