ISPConfig 3:f02fd3979b6e2b5caa99d468e378ca6e0f613743 commitshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commits/f02fd3979b6e2b5caa99d468e378ca6e0f6137432022-06-15T13:29:35+02:00https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f02fd3979b6e2b5caa99d468e378ca6e0f613743Only show the btn_edit_as_txt_record_txt button to admins2022-06-15T13:29:35+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c23469256deeaf0085e801053c9e7b1823a62c99Use is_admin() for admin check2022-06-15T13:29:06+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 #6346
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">ispconfig/ispconfig3!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/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 #6230
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">ispconfig/ispconfig3!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">ispconfig/ispconfig3!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/a316c43794d776c59a44b0f949d6c9b85d3bc4a6Remove duplicate translation strings2022-04-26T21:02:08+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/221728d6f013a3eae97f86a1d38a386b9d5f31a6Merge branch '6326-avoid-bashism-in-acme.sh' into 'develop'2022-04-07T13:43:26+00:00Marius Burkardm.burkard@pixcept.de
Avoid bashisms in the call to acme.sh
Closes #6326
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1595" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1595" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3381" data-project-path="ispconfig/ispconfig3" data-iid="1595" data-container="body" data-placement="top" title="Avoid bashisms in the call to acme.sh" class="gfm gfm-merge_request">ispconfig/ispconfig3!1595</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/2ffabb4d36174c2de8fa3db6d1a813c29151add9Avoid bashisms in the call to acme.sh2022-04-04T14:20:15+02:00Mattia Rizzolomattia@mapreri.org
This command is using features that are not POSIX-compliant (the [[ and
the || in them), that despite being supported by many shells (including
bash) are not available in dash.
Since system() runs the code with /bin/sh that is an interface defined
as only being POSIX-compliant, with no extensions, it should not presume
a specific shell in that.
Closes: #6326
Signed-off-by: <span data-trailer="Signed-off-by:"><a href="mailto:mattia@mapreri.org" title="mattia@mapreri.org"><img alt="default avatar" src="/ispconfig/ispconfig3/-/blob/develop/assets/no_avatar-849f9c04a3a0d0cea2424ae97b27447dc64a7dbfae83c036c45b403392f0e8ba.png" class="avatar s16 avatar-inline gfm"></a><a href="mailto:mattia@mapreri.org" title="mattia@mapreri.org">Mattia Rizzolo</a> <<a href="mailto:mattia@mapreri.org" title="mattia@mapreri.org">mattia@mapreri.org</a>></span>
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/dfa68522370389e380207805c63c2fae53dd8b7eDutch translation2022-04-02T09:11:42+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/985b026b9c4a34162be51de0e990e9335fa2accdAdd missing translation strings2022-04-02T09:02:36+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/103443ce2a10d8dba27f26f49630a12abf938e1cMerge remote-tracking branch 'origin/develop' into 2558-two-factor-authentica...2022-03-31T08:27:14+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/88edc27ec110e7b38afa5ae9db5f5d2fb623f8f9Merge branch '6317-updated-italian-translation-attached' into 'develop'2022-03-31T05:41:29+00:00Marius Burkardm.burkard@pixcept.de
Resolve "Updated Italian translation (attached)"
Closes #6317
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1591" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1591" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3372" data-project-path="ispconfig/ispconfig3" data-iid="1591" data-container="body" data-placement="top" title='Resolve "Updated Italian translation (attached)"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1591</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e0467cedf242a3c0b6afb9525828a2fe33ddf7e3Merge branch '6320-fix-email-backup-stats' into 'develop'2022-03-31T05:33:13+00:00Marius Burkardm.burkard@pixcept.de
Changed 'Client Limit'-check and fixed styling
Closes #6320
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1593" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1593" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3377" data-project-path="ispconfig/ispconfig3" data-iid="1593" data-container="body" data-placement="top" title="Changed 'Client Limit'-check and fixed styling" class="gfm gfm-merge_request">ispconfig/ispconfig3!1593</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c4d52f6a5934556d9bb8dbff8c2b5d159a632347removed unneccessary words 2022-03-31T05:31:05+00:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/89a12aeae7f34b11513fe0c0549b66c115775d07Changed 'Client Limit'-check and fixed styling2022-03-30T14:01:36+02:00Tim de Boertim@tim427.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c7f61ad13d09df86ac4cd3500692d4ea7acf7e93Admin users are not related to a client, thus use the globally configured ema...2022-03-28T20:25:29+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/7436c4d3dcdf25e18dde187ee9f0694f30d78b0cUse email adres from the client table, +error handling2022-03-28T20:01:10+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/3e91558f98ba9668a0575b1253b6352cea51d39cFix AFTER2022-03-27T23:50:42+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/25caa5b0097a4493a34c771f6d450e4a5cd65e81Add none type2022-03-27T23:48:59+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6c9929987f1c6c0c80c9295263015b2ae5ed84ffAdd translations2022-03-27T23:21:59+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d2870a260a231c5283ea5499d40ae73847a76110Log when using 2fa2022-03-27T15:10:14+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/700a31e0866fa7e35e15748ea75d00e8ccee794efix extra space2022-03-27T15:10:02+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5248548adcede1044c2ea36e80746f382a70118fCode cleanup2022-03-27T15:05:58+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d36ffac1ad58396d48f74c14de6be591d0b99fddRewrite email sending to use ispcmail, and translate2022-03-27T14:58:07+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8eaa875b113713f079626aa4575c3ecd0c0341f6Only regenerate code when sending a mail $new_otp_code is not stored unhashed2022-03-27T14:35:45+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/f30ba514806d23ad196b73dd04f0d0fabc5f9395Reduce scope, validation state can later be stored in otp_data.2022-03-27T14:10:17+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/792764fea2f41f35b2b611f0ca40f175e75fef77fix permission2022-03-27T13:42:05+02:00Herman van Rinkrink@initfour.nl