ISPConfig 3:9413504e5445ca82a98cb491276006b08351d342 commitshttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commits/9413504e5445ca82a98cb491276006b08351d3422020-09-13T20:59:44+02:00https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/9413504e5445ca82a98cb491276006b08351d342Update copyright note2020-09-13T20:59:44+02:00thomthom@amsterdamtech.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/98ba3c40570ae8000a4510ecfa4f10ef26f06850Merge branch 'newline-cron_debug' into 'develop'2020-09-11T12:23:58+02:00Till Brehmtbrehm@ispconfig.org
Add a new line at the end of the die in cron_debug.php
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1145" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1145" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1886" data-project-path="ispconfig/ispconfig3" data-iid="1145" data-container="body" data-placement="top" title="Add a new line at the end of the die in cron_debug.php" class="gfm gfm-merge_request">!1145</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/53d0e130910d58e8798b1da794742214c5b13509add a new line at the end of the die2020-09-11T12:11:41+02:00Michael Seevogelgit@michaelseevogel.dehttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/11f099932068a7471fd1345f672d146aced62fc3Merge branch 'develop' of https://git.ispconfig.org/ispconfig/ispconfig3 into...2020-09-11T12:09:20+02:00Michael Seevogelgit@michaelseevogel.dehttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/b4972db3ac5c32d5f0996c6711d6b02dad692efeMerge branch '5729-le' into 'develop'2020-09-11T10:54:48+02:00Till Brehmtbrehm@ispconfig.org
Remove LE from installer questions (#5729)
Closes #5729
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1144" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1144" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1885" data-project-path="ispconfig/ispconfig3" data-iid="1144" data-container="body" data-placement="top" title="Remove LE from installer questions (#5729)" class="gfm gfm-merge_request">ispconfig/ispconfig3!1144</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/d5cc75397a19e762d66b8c08b6d1d60ac7d2ef00Remove LE from installer questions (#5729)2020-09-11T10:34:40+02:00thomthom@amsterdamtech.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/85f0039708dfc34bd368648b83d24e05ca93da9aChanged version number from 3.1dev to 3.2dev2020-09-10T16:57:53+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/c3e4316aac4adccb220c2fb82dd04d0140e8bd64Merge branch 'develop' of https://git.ispconfig.org/ispconfig/ispconfig3 into...2020-09-10T13:53:29+02:00Michael Seevogelgit@michaelseevogel.dehttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/db71b221ff760c2e32257d42c668edd7e365a565Merge branch 'install-strings' into 'develop'2020-09-10T12:45:54+02:00Till Brehmtbrehm@ispconfig.org
stable-3.1 -> develop
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1080" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1080" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1643" data-project-path="ispconfig/ispconfig3" data-iid="1080" data-container="body" data-placement="top" title="stable-3.1 -> develop" class="gfm gfm-merge_request">ispconfig/ispconfig3!1080</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/cf9c6c9c1f9889a3d6befc29f1a30766c6411cd3Merge branch '621-dev' into 'develop'2020-09-10T12:37:59+02:00Till Brehmtbrehm@ispconfig.org
Change date format (Ported from !621)
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1140" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1140" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1875" data-project-path="ispconfig/ispconfig3" data-iid="1140" data-container="body" data-placement="top" title="Change date format (Ported from !621)" class="gfm gfm-merge_request">ispconfig/ispconfig3!1140</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/ea591d477d281455b0dcc82a135d0ded7c0e4819Update ispconfig_update.php2020-09-10T12:37:26+02:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/8cb465c7118e02358504f6350b723acedef86f84Change date format (Ported from !621)2020-09-10T11:50:17+02:00thomthom@amsterdamtech.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/2442aed36476c91fabb9683081e2ec8277e245f5Merge branch 'develop' of https://git.ispconfig.org/ispconfig/ispconfig3 into...2020-09-10T11:44:40+02:00Michael Seevogelgit@michaelseevogel.dehttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/2003c7ca6121c19d430ab73dd04390acdad282a6Merge branch '634-develop' into 'develop'2020-09-10T11:38:10+02:00Till Brehmtbrehm@ispconfig.org
Fix typo (ported from !634)
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1133" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1133" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1864" data-project-path="ispconfig/ispconfig3" data-iid="1133" data-container="body" data-placement="top" title="Fix typo (ported from !634)" class="gfm gfm-merge_request">ispconfig/ispconfig3!1133</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/a230f0c105981fcb7219c3114f07c9316e8701d6Merge branch 'patch-rescue' into 'develop'2020-09-10T11:37:17+02:00Till Brehmtbrehm@ispconfig.org
Patch rescue
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1132" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1132" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1863" data-project-path="ispconfig/ispconfig3" data-iid="1132" data-container="body" data-placement="top" title="Patch rescue" class="gfm gfm-merge_request">ispconfig/ispconfig3!1132</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/54fb5f4299660e222965703410444e185069912dMerge branch '654-dev' into 'develop'2020-09-10T11:35:12+02:00Till Brehmtbrehm@ispconfig.org
Update login string (Backport from !654)
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1138" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1138" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1869" data-project-path="ispconfig/ispconfig3" data-iid="1138" data-container="body" data-placement="top" title="Update login string (Backport from !654)" class="gfm gfm-merge_request">ispconfig/ispconfig3!1138</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/d911c6bc0423315a8b62b0b916fce90bec568774Merge branch '890-dev' into 'develop'2020-09-10T11:34:34+02:00Till Brehmtbrehm@ispconfig.org
Dutch and french translations for quota emails
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1135" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1135" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1866" data-project-path="ispconfig/ispconfig3" data-iid="1135" data-container="body" data-placement="top" title="Dutch and french translations for quota emails" class="gfm gfm-merge_request">ispconfig/ispconfig3!1135</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/4784d558e38bfd38993fcf3b4a2e71884f2be32eMerge branch 'conf-forgotten' into 'develop'2020-09-10T11:33:44+02:00Till Brehmtbrehm@ispconfig.org
Add changes from install/tpl
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1136" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1136" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1867" data-project-path="ispconfig/ispconfig3" data-iid="1136" data-container="body" data-placement="top" title="Add changes from install/tpl" class="gfm gfm-merge_request">ispconfig/ispconfig3!1136</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/9bd65ce93757ccbb273b013abf8d1ba2d01a3e4bUse user and group ispconfig for mpm_itk2020-09-09T20:56:34+02:00thomthom@amsterdamtech.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/a2b79acb5979d96b79821d1f1233c051271c2223Merge branch 'develop' of https://git.ispconfig.org/ispconfig/ispconfig3 into...2020-09-09T15:29:44+02:00Michael Seevogelgit@michaelseevogel.dehttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/c53649d357a40252fbf26655b6cc341818632307Update login string (Backport from !654)2020-09-09T15:17:36+02:00thomthom@amsterdamtech.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/29478d386d5ed46884d7e050131581dab2cb8a3cAdd changes from install/tpl2020-09-09T14:15:23+02:00thomthom@amsterdamtech.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/9deb193d38df62de62a45b49615b09ab22bdc00aAdd dutch quota notifications2020-09-09T14:12:20+02:00thomthom@amsterdamtech.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/0d4245619de2bc2bde9211f1dde75298702d2da6Add french templates for conf/mail (Backport from !890)2020-09-09T14:05:34+02:00thomthom@amsterdamtech.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/9a910404b384aa843d35e86254e715ced14c7751Apply 1 suggestion(s) to 1 file(s)2020-09-09T13:31:15+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/d7151cce9bd04bc1da50121472103974eb90c4bbMerge branch '5728-stable-old-caa-requiered-le-cert-s-can-t-issued-anymore' i...2020-09-09T12:36:29+02:00Marius Burkardm.burkard@pixcept.de
Resolve "[Stable-old] CAA requiered? LE Cert's can't issued anymore"
Closes #5728
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1134" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1134" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1865" data-project-path="ispconfig/ispconfig3" data-iid="1134" data-container="body" data-placement="top" title="Resolve "[Stable-old] CAA requiered? LE Cert's can't issued anymore"" class="gfm gfm-merge_request">ispconfig/ispconfig3!1134</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/e5d4f276279d5a81181b2e539efc9c3cbfd3a997- fixed variable typo from !11282020-09-09T12:16:47+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/a3471bc8fa49d734099cbf2ebfcc412560515227Create a util function to remove duplication2020-09-09T11:21:46+02:00Herman van Rinkrink@initfour.nl
Lost on master(!866) ... now on cherry-picked on !1132https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/b0867b430049854c2194f6b1cecc4c0bfe3c669fMy first translation update2020-09-09T11:17:10+02:00Herman van Rinkrink@initfour.nl
Cherry-picked from !826 after master change.https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/54dd36eb0fc627e7bdf98e36c1281e52318a7686Do not show db or site quota when the sites module is not active2020-09-09T11:14:22+02:00Herman van Rinkrink@initfour.nl
Cherry-picked from !825 after master change.https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/7b7e428903a726175191dda722a753d2f5b61e4aFix typo (ported from !634)2020-09-09T09:45:45+02:00thomthom@amsterdamtech.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/12e79e44e42c1bf136e6e87cb14fe184f4c15776correct index path2020-09-08T22:34:50+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/2b67b4c720f5459754b6d90242b42de0ecc6089fSet a descriptive name for the return vanlue of mail_user_add();2020-09-08T22:34:33+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/a9718449e8721466b26142bb311cb0accc152922fix typo2020-09-08T22:33:17+02:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/54d11f0f3e5b008dab20178ddf64f4b75fce9dd8- added missing runner file2020-09-08T15:50:47+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/63ae4071a96ce1556fbe34a158ff089a052e4af4Update README.md2020-09-08T15:16:53+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/fa3ee6c5d2c1edf3dbbb566d97bfa7ae455f434eMerge branch 'develop' into 'install-strings'2020-09-08T15:16:15+02:00Marius Burkardm.burkard@pixcept.de
# Conflicts:
# server/scripts/update_from_dev_stable.shhttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/82f6e7b12aae0c3311fedce7ecb1bd8d7db35661- update script rework2020-09-08T14:46:57+02:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/c89029d7017cc5c8eae0bb2fd6da8b52dfcecfbfMerge branch 'patch-3' into 'stable-3.1'2020-09-08T13:14:09+02:00Till Brehmtbrehm@ispconfig.org
Allow creating LE SSL certs during ISPConfig 3.1 stable install or update
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/911" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!911" data-link="false" data-link-reference="false" data-project="1" data-merge-request="1201" data-project-path="ispconfig/ispconfig3" data-iid="911" data-container="body" data-placement="top" title="Allow creating LE SSL certs during ISPConfig 3.1 stable install or update" class="gfm gfm-merge_request">ispconfig/ispconfig3!911</a>https://git.ispconfig.org/GwynethLlewelyn/ispconfig3/-/commit/2856951fba5db327c5710391ea24e231406127aeUpdate installer_base.lib.php to get LE SSL certs for the server via certbot...2020-09-08T13:14:09+02:00Hj Ahmad Rasyid Hj Ismailahrasis@gmail.comUpdate installer_base.lib.php to get LE SSL certs for the server via certbot or acme.sh before openssl self-signed method upon new installation or existing update; and extend it to other available services (postfix, pure-ftpd-mysql), with additional dhparam pem file, if none exists.