ISPConfig 3:51119d7cddb25e3a6b780cb83ab44972548aec1b commitshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commits/51119d7cddb25e3a6b780cb83ab44972548aec1b2022-08-15T22:15:00+00:00https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/51119d7cddb25e3a6b780cb83ab44972548aec1bMerge branch '6331-delete-ordering' into 'develop'2022-08-15T22:15:00+00:00Marius Burkardm.burkard@pixcept.de
Delete mail_domain after mail_user records
Closes #6331
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1598" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1598" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3396" data-project-path="ispconfig/ispconfig3" data-iid="1598" data-container="body" data-placement="top" title="Delete mail_domain after mail_user records" class="gfm gfm-merge_request">ispconfig/ispconfig3!1598</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/b0b511a50dd90c0fe70b8a9917fad066d07e8d9aMerge branch '4618-allow-acme-with-proxy-redirect' into 'develop'2022-08-15T22:14:17+00:00Marius Burkardm.burkard@pixcept.de
nginx: Added ACME redirect to main domain based on alias domain fix
Closes #4618
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1604" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1604" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3433" data-project-path="ispconfig/ispconfig3" data-iid="1604" data-container="body" data-placement="top" title="nginx: Added ACME redirect to main domain based on alias domain fix" class="gfm gfm-merge_request">ispconfig/ispconfig3!1604</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/9c03da04b2270d494f7e09eb1a198f04309a0286Merge branch '6304-del-database' into 'develop'2022-08-15T22:13:36+00:00Marius Burkardm.burkard@pixcept.de
Also cleanup databases when a client is deleted, fixes #6304
Closes #6304
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1596" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1596" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3394" data-project-path="ispconfig/ispconfig3" data-iid="1596" data-container="body" data-placement="top" title="Also cleanup databases when a client is deleted, fixes #6304" class="gfm gfm-merge_request">ispconfig/ispconfig3!1596</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/dae33db1d76ca30eac10c7571cf0870511d82602Merge branch '6366-lower-the-entropy-test-value-in-bind-plugin-to-200' into '...2022-08-15T22:12:06+00:00Marius Burkardm.burkard@pixcept.de
Resolve "Lower the entropy test value in BIND plugin to 200"
Closes #6366
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1619" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1619" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3564" data-project-path="ispconfig/ispconfig3" data-iid="1619" data-container="body" data-placement="top" title='Resolve "Lower the entropy test value in BIND plugin to 200"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1619</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cd84fcc6ae81e853d205ddc5ffdbb05c948d6604Merge branch '6334-show-name-to-delete' into 'develop'2022-08-15T22:11:47+00:00Marius Burkardm.burkard@pixcept.de
Show the client name on the delete confirmation page
Closes #6334
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1601" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1601" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3418" data-project-path="ispconfig/ispconfig3" data-iid="1601" data-container="body" data-placement="top" title="Show the client name on the delete confirmation page" class="gfm gfm-merge_request">ispconfig/ispconfig3!1601</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2ee27283d9b2129c3544a5f7421bb74a0a02c9b4Merge branch 'dupe-code-warning' into 'develop'2022-08-15T22:11:08+00:00Marius Burkardm.burkard@pixcept.de
Warn about duplicate code in a comment
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1597" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1597" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3395" data-project-path="ispconfig/ispconfig3" data-iid="1597" data-container="body" data-placement="top" title="Warn about duplicate code in a comment" class="gfm gfm-merge_request">ispconfig/ispconfig3!1597</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cf57ac78ce4684b77a649e08c7d678fa5ce0b543Merge branch 'mr889-backport' into 'develop'2022-08-15T22:10:37+00:00Marius Burkardm.burkard@pixcept.de
Backport MR !889, unify settings between distros and improves
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1609" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1609" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3478" data-project-path="ispconfig/ispconfig3" data-iid="1609" data-container="body" data-placement="top" title="Backport MR !889, unify settings between distros and improves" class="gfm gfm-merge_request">ispconfig/ispconfig3!1609</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8bfb44ff665676a92ebb23adf9a2af8027f754b8Merge branch '6322-jquery-error-zone-import' into 'develop'2022-08-15T22:08:43+00:00Marius Burkardm.burkard@pixcept.de
Change deprecated JQuery .load() to .on("load") - #6322
Closes #6322
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1607" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1607" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3471" data-project-path="ispconfig/ispconfig3" data-iid="1607" data-container="body" data-placement="top" title='Change deprecated JQuery .load() to .on("load") - #6322' class="gfm gfm-merge_request">ispconfig/ispconfig3!1607</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e8c9f64d243d8cf599fdd132d08945833cfef53bMerge branch '6333-mail_user_get_all_by_domain' into 'develop'2022-08-15T22:07:12+00:00Marius Burkardm.burkard@pixcept.de
Resolve "API to get mail user details for all account that belong to a domain"
Closes #6333
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1600" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1600" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3408" data-project-path="ispconfig/ispconfig3" data-iid="1600" data-container="body" data-placement="top" title='Resolve "API to get mail user details for all account that belong to a domain"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1600</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bb50b985a2baca980c53e840d37485d746f2efa6Merge branch '6332-mail_user_get_all_by_client' into 'develop'2022-08-15T22:06:53+00:00Marius Burkardm.burkard@pixcept.de
Add API function mail_user_get_all_by_client, #6332
Closes #6332
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1599" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1599" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3397" data-project-path="ispconfig/ispconfig3" data-iid="1599" data-container="body" data-placement="top" title="Add API function mail_user_get_all_by_client, #6332" class="gfm gfm-merge_request">ispconfig/ispconfig3!1599</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/52348ef9aa4241f85c4715112d1c7ccfea838baaMerge branch 'datalog-list-add-user-field' into 'develop'2022-08-15T22:05:09+00:00Marius Burkardm.burkard@pixcept.de
Added user field to datalog list view
Closes #6370
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1621" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1621" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3570" data-project-path="ispconfig/ispconfig3" data-iid="1621" data-container="body" data-placement="top" title="Added user field to datalog list view" class="gfm gfm-merge_request">ispconfig/ispconfig3!1621</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/59df847fbcf82e68c535c89fb9ff6c95ef3bb342Merge branch 'rhel-pureftpd-logfile' into 'develop'2022-08-15T22:00:18+00:00Marius Burkardm.burkard@pixcept.de
Check for different pure-ftpd log file locations (fixes FTP stats for EPEL/RHEL)
Closes #6378
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1625" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1625" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3611" data-project-path="ispconfig/ispconfig3" data-iid="1625" data-container="body" data-placement="top" title="Check for different pure-ftpd log file locations (fixes FTP stats for EPEL/RHEL)" class="gfm gfm-merge_request">ispconfig/ispconfig3!1625</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/242b70ca01d3c51b9eb046b898d145466254f3d2- Check for different pure-ftpd log file locations (fixes FTP stats for EPEL/...2022-08-15T11:56:00+02:00Michael Seevogelgit@michaelseevogel.de- Updated edit links in html templatehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1a6acb2a5f68e043214285c81ef2c8da8b8c7b80clean up lng files2022-07-29T16:35:31+02:00Michael Seevogelgit@michaelseevogel.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/761ddde9f0c146a2cdd539c679f7c3e0451eedc4update branch2022-07-29T16:22:12+02:00Michael Seevogelgit@michaelseevogel.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/821b16a4c56fe3cd5e81f0d2d3eb8679e3def0f1Update bind_plugin.inc.php2022-07-23T05:00:18+00:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ffd05eb429b162b57846aed1769055f499a183ebExtend example to show Lookup by pattern2022-06-12T20:32:22+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cb24e263417972692baee6a1381d4cada434d835Backport MR !889, unify settings between distros and improves2022-05-21T20:56:57+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5bbec2b903af359db14e518809fcf97d13d0c58eMerge branch '2558-two-factor-authentication' into 'develop'2022-05-19T10:03:29+00:00Marius Burkardm.burkard@pixcept.de
Resolve "Two-factor authentication"
Closes <a href="/ispconfig/ispconfig3/-/issues/2558" data-reference-type="issue" data-original="#2558" data-link="false" data-link-reference="false" data-project="1" data-issue="20643" data-project-path="ispconfig/ispconfig3" data-iid="2558" data-issue-type="issue" data-container="body" data-placement="top" title="Two-factor authentication" class="gfm gfm-issue">#2558</a>
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1575" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1575" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3327" data-project-path="ispconfig/ispconfig3" data-iid="1575" data-container="body" data-placement="top" title='Resolve "Two-factor authentication"' class="gfm gfm-merge_request">!1575</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/80d3a532fa8040d9440ee6f458cd80bdc469a2d3Merge branch '6346-send-email-to-reseller-when-quota-is-reached' into 'develop'2022-05-18T21:15:06+00:00Marius Burkardm.burkard@pixcept.de
Resolve "Send email to reseller when quota is reached"
Closes <a href="/ispconfig/ispconfig3/-/issues/6346" data-reference-type="issue" data-original="#6346" data-link="false" data-link-reference="false" data-project="1" data-issue="26346" data-project-path="ispconfig/ispconfig3" data-iid="6346" data-issue-type="issue" data-container="body" data-placement="top" title="Send email to reseller when quota is reached" class="gfm gfm-issue">#6346</a>
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1608" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1608" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3472" data-project-path="ispconfig/ispconfig3" data-iid="1608" data-container="body" data-placement="top" title='Resolve "Send email to reseller when quota is reached"' class="gfm gfm-merge_request">!1608</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/323428ff188094b52b2ebdc674973f4b3b21ba9dFix checks to send email also if only reseller should receive it (#6346)2022-05-18T23:07:15+02:00Thom Polthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ca51eab3d1d8eea1e2d11c20047da6b7c558421bFix checks to send email also if only reseller should receive it (#6346)2022-05-18T22:43:50+02:00Thom Polthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d685b8539c818d4661fa2ac6cf0cc863c2eb62c1Fix checks to send email also if only reseller should receive it (#6346)2022-05-18T22:41:40+02:00Thom Polthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/4a1ae3f66ce360fb3ab368c84ecabec92f973824Implement quota notification to reseller for all notification types (#6346)2022-05-18T20:17:11+02:00Thom Polthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6d0e9698f537d41961e316c247fa7625aa493eb0Add function to send quota notification to reseller (#6346)2022-05-18T19:58:45+02:00Thom Polthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/9ab02a9da2a5435394b6e154a0948f7aa87599c0Change depracated .load() to .on("load") - #63222022-05-18T17:45:29+01:00Dovi Cowandovi@fullynetworking.co.ukhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/401fb9255a02425447273d5d090a03a7cffafb10Merge branch '6230-patch-copy-to-clipboard' into 'develop'2022-05-18T11:46:35+00:00Marius Burkardm.burkard@pixcept.de
Add Copy to clipboard button to shell user account and emailboxes
Closes <a href="/ispconfig/ispconfig3/-/issues/6230" data-reference-type="issue" data-original="#6230" data-link="false" data-link-reference="false" data-project="1" data-issue="26088" data-project-path="ispconfig/ispconfig3" data-iid="6230" data-issue-type="issue" data-container="body" data-placement="top" title="Copy email address to clipboard" class="gfm gfm-issue">#6230</a>
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1543" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1543" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3110" data-project-path="ispconfig/ispconfig3" data-iid="1543" data-container="body" data-placement="top" title="Add Copy to clipboard button to shell user account and emailboxes" class="gfm gfm-merge_request">!1543</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/fe25cf93770c252d777fc983b6cbea91bfee0fd4Back to a button, now with proper styling thanks to @pixcept2022-05-17T23:19:36+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/bc63771a7d86cd0d2f737b545a2bfbec1beb16c3Merge branch 'Steveorevo-develop-patch-56504' into 'develop'2022-05-17T19:44:50+00:00Marius Burkardm.burkard@pixcept.de
Typo, update ispconfig.css
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1606" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1606" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3465" data-project-path="ispconfig/ispconfig3" data-iid="1606" data-container="body" data-placement="top" title="Typo, update ispconfig.css" class="gfm gfm-merge_request">!1606</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5515afea5b4e0859c040e16275ce2bceb4ce0700Apply 1 suggestion(s) to 1 file(s)2022-05-17T19:36:57+00:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/374e6e74e302243a5016b7c7e6c1e68136931cc0Typo, update ispconfig.css2022-05-15T18:38:11+00:00Stephen Carnamsteveorevo@gmail.comhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0904fa4e296e545b1971812f7248b67fbb0d3affLimit sending extra mails to 30 seconds2022-05-15T20:22:09+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/70519bae8ef284f4d8f8a872002009442e3a6bd6codestyle2022-05-15T15:05:41+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ea51b5e4ac42ec84b1a133148b0ea007f1410320Re-add lost logging for loginAs scenario2022-05-15T12:03:41+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/71902663422993897ba00fb880b6e7e874c1332fMerge remote-tracking branch 'origin/develop' into 6230-patch-copy-to-clipboard2022-05-14T22:46:08+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/23112c3eefb94812526048fa5ceb226db72ad13dnginx: Added ACME redirect to main domain based on alias domain fix2022-04-28T15:48:20+02:00Judah MWjudah@maximaweb.dev
This allows sites using redirect=proxy to still generate ACME
certificates by not passing the acme requests through to the proxy.
We should also consider using this for other features available such as
own error documents, SSI and custom directives.https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a316c43794d776c59a44b0f949d6c9b85d3bc4a6Remove duplicate translation strings2022-04-26T21:02:08+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/46c7e58ae9b761ddc278b05fb1e375d9d54acf4aShow the client name on the delete confirmation page2022-04-23T13:39:55+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/4c83fa6ee6a1a294de63f7f3268f8ee67032b309Add API function mail_user_get_all_by_client, #63322022-04-10T17:37:28+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3dbdfd4a3cb448031e812713772e6d46218eb113Delete mail_domain after mail_user records2022-04-09T23:17:19+02:00Herman van Rinkrink@initfour.nl