ISPConfig 3:develop commits
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commits/develop
2021-10-30T12:16:32+00:00
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/f97349668b97aaceda7b83479bb0c8651e2b9359
Merge branch '6237-amavis-permission' into 'develop'
2021-10-30T12:16:32+00:00
Marius Burkard
m.burkard@pixcept.de
Set amavis group for 50-user to make it readable in Debian 11
Closes #6237
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1530" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1530" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3040" data-project-path="ispconfig/ispconfig3" data-iid="1530" data-container="body" data-placement="top" title="Set amavis group for 50-user to make it readable in Debian 11" class="gfm gfm-merge_request">ispconfig/ispconfig3!1530</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/57500beece2b66f3a15c93d72db5e1472caf7577
Merge branch 'develop' into 'develop'
2021-10-24T21:16:52+00:00
Marius Burkard
m.burkard@pixcept.de
Update jQuery
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1535" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1535" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3057" data-project-path="ispconfig/ispconfig3" data-iid="1535" data-container="body" data-placement="top" title="Update jQuery" class="gfm gfm-merge_request">ispconfig/ispconfig3!1535</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/a456708d05a40212bb746fafc4a1fe2c6ef736cc
Merge branch '6163-confidential-issue' into 'develop'
2021-10-24T21:06:21+00:00
Marius Burkard
m.burkard@pixcept.de
6163 confidential issue
See merge request ispconfig-confidential/ispconfig3!5
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/8eed1daed814b28d2fce96eb78c575f23fd60d6c
- allow patch version in release scripts
2021-10-22T09:25:30+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/df99cfd51a41df0bf411eeee5317b88e5d5ce5e6
Merge branch '6244-3-2-7-remote-api-login-fails-if-restricted-by-remote_ips' ...
2021-10-22T06:44:58+00:00
Till Brehm
tbrehm@ispconfig.org
Resolve "3.2.7: remote api login fails if restricted by remote_ips"
Closes #6244
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1534" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1534" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3055" data-project-path="ispconfig/ispconfig3" data-iid="1534" data-container="body" data-placement="top" title='Resolve "3.2.7: remote api login fails if restricted by remote_ips"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1534</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/ae955620e9e1f5461ed1c82a138720124634a8ab
fix conflicting $ip tmp variable name
2021-10-21T16:04:40-06:00
Jesse Norell
jesse@kci.net
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/a0c3cdab7296b1c485041e74ccd0f37f52af04e2
- renamed incremental sql file for release
2021-10-21T16:11:19+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/b15856da5c5ddd1f2db9f7013a0506b99172d561
Merge branch 'develop' into 'develop'
2021-10-21T14:09:24+00:00
Marius Burkard
m.burkard@pixcept.de
Improve API security
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1533" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1533" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3054" data-project-path="ispconfig/ispconfig3" data-iid="1533" data-container="body" data-placement="top" title="Improve API security" class="gfm gfm-merge_request">ispconfig/ispconfig3!1533</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/d2b75bd84befec4bfaf27bee2687f738a5e7bd4b
Merge branch '6238-installer-certificate-symlink-handling' into 'develop'
2021-10-21T13:59:07+00:00
Marius Burkard
m.burkard@pixcept.de
Resolve "installer certificate symlink handling"
Closes #6238
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1527" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1527" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3029" data-project-path="ispconfig/ispconfig3" data-iid="1527" data-container="body" data-placement="top" title='Resolve "installer certificate symlink handling"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1527</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/99b8b423453979ea97849889ad209670ce9d730b
- hide mail whilelist / blacklist from menu of client when limit is 0
2021-10-20T10:35:53+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/26ecd813363732ce7f83d83420dddd1e63453184
Merge branch 'develop' of git.ispconfig.org:ispconfig-confidential/ispconfig3...
2021-10-20T10:35:48+02:00
Marius Burkard
m.burkard@pixcept.de
Merge branch 'develop' of git.ispconfig.org:ispconfig-confidential/ispconfig3 into confidential-develop
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/cfe9bd3fb2b8a9ee33ca25c82b764607a4e75ac2
Changed lockout conditions.
2021-10-19T15:39:22+02:00
Till Brehm
tbrehm@ispconfig.org
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/139bbcaf8646e3ad7ab42b82bc31e4756feaba7f
Various security improvments in API and server code.
2021-10-19T15:21:46+02:00
Till Brehm
tbrehm@ispconfig.org
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/2285eec431fef0864bd41c4260b345388583f863
Updated Debian version in readme file
2021-10-19T10:12:07+02:00
Till Brehm
tbrehm@ispconfig.org
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/5562dce00f0ffbcb4f58687ae58ed038b00f7dd5
Merge branch 'develop' into confidential-develop
2021-10-19T10:00:58+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/3c86c392bf103b9581c6f440d0f03a43c98b47aa
Set amavis group for 50-user to make it readable in Debian 11
2021-10-13T11:34:38+02:00
Herman van Rink
rink@initfour.nl
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/c8171a068547204c700dc32f53563711c8bcb0c5
installer: handle server certificate files/links better
2021-10-07T15:11:33-06:00
Jesse Norell
jesse@kci.net
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/2b30a07273a45488e36bb81de699c6829e0a603a
Merge branch '6231-php-5-4-incompatibility-array_column' into 'develop'
2021-09-16T07:37:45+00:00
Till Brehm
tbrehm@ispconfig.org
Resolve "php 5.4 incompatibility array_column"
Closes #6231
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1524" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1524" data-link="false" data-link-reference="false" data-project="1" data-merge-request="2988" data-project-path="ispconfig/ispconfig3" data-iid="1524" data-container="body" data-placement="top" title='Resolve "php 5.4 incompatibility array_column"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1524</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/ac7b645dd4108f0007be71e9ad33e56c3dd6d99f
add array_column function if not exists
2021-09-09T16:57:58-06:00
Jesse Norell
jesse@kci.net
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/84a35dd2eefb702569ec3f43de81f923e561f4b2
Merge branch 'pre-release-3.2.6' into 'develop'
2021-09-08T11:31:00+00:00
Marius Burkard
m.burkard@pixcept.de
Pre-Release 3.2.6
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1523" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1523" data-link="false" data-link-reference="false" data-project="1" data-merge-request="2982" data-project-path="ispconfig/ispconfig3" data-iid="1523" data-container="body" data-placement="top" title="Pre-Release 3.2.6" class="gfm gfm-merge_request">ispconfig/ispconfig3!1523</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/be46cb1959683ce3650beb4232d03fe0e8b101e4
- pre-release update files
2021-09-08T13:20:04+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/c14d6c0bd89e7d21bbbb3acbcaef545c55093432
Merge branch '6219-duplicate-mail_transport-domain-are-allowed' into develop
2021-09-08T13:16:11+02:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/f8cd496afbe1ea03fbd8664da29ab928939eb417
Apply 1 suggestion(s) to 1 file(s)
2021-09-08T09:57:46+00:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/78b85af4b1fc799b0a96ee191e82e563750c4f85
Apply 1 suggestion(s) to 1 file(s)
2021-09-08T09:56:59+00:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/6211dedbb389ef173a8b4c8b4832f03c600e401e
Merge branch '6229-duplicate-forwards-must-be-allowed-revert-for-6212' into '...
2021-09-08T08:50:20+00:00
Marius Burkard
m.burkard@pixcept.de
Resolve "Duplicate forwards must be allowed, revert for #6212"
Closes #6229
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1522" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1522" data-link="false" data-link-reference="false" data-project="1" data-merge-request="2981" data-project-path="ispconfig/ispconfig3" data-iid="1522" data-container="body" data-placement="top" title='Resolve "Duplicate forwards must be allowed, revert for #6212"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1522</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/6c65d2b40f956334884a6ab9132e331ac9adb388
Merge branch 'fix-proxy-https' into 'develop'
2021-09-08T08:39:43+00:00
Marius Burkard
m.burkard@pixcept.de
Fixed: Rewrite proxy for ssl targets
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1521" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1521" data-link="false" data-link-reference="false" data-project="1" data-merge-request="2978" data-project-path="ispconfig/ispconfig3" data-iid="1521" data-container="body" data-placement="top" title="Fixed: Rewrite proxy for ssl targets" class="gfm gfm-merge_request">ispconfig/ispconfig3!1521</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/a0cf4fae5acb124ab45aae7bb9fe58ae6dc899cd
Update upd_0094.php
2021-09-08T08:20:18+00:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/e7fe31a7951d796654cf03374538a2d2153fd5b1
Revert unique forward
2021-09-08T08:17:44+00:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/22bef49db8fe0b110cef3bf2eedd95944264c607
Merge branch '6181-fix-fpm-socket-dir' into 'develop'
2021-09-08T07:47:27+00:00
Marius Burkard
m.burkard@pixcept.de
6181-fix-fpm-socket-dir: Fix socket dir for additional php versions
Closes #6181
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1490" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1490" data-link="false" data-link-reference="false" data-project="1" data-merge-request="2797" data-project-path="ispconfig/ispconfig3" data-iid="1490" data-container="body" data-placement="top" title="6181-fix-fpm-socket-dir: Fix socket dir for additional php versions" class="gfm gfm-merge_request">ispconfig/ispconfig3!1490</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/ba63092bd349a5d6b4f4e38f3c0cd9e3b3378557
Merge branch '6224-missing-loc-functions' into 'develop'
2021-09-08T07:39:37+00:00
Marius Burkard
m.burkard@pixcept.de
Add api functions for DNS type LOC, #6224
Closes #6224
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1519" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1519" data-link="false" data-link-reference="false" data-project="1" data-merge-request="2972" data-project-path="ispconfig/ispconfig3" data-iid="1519" data-container="body" data-placement="top" title="Add api functions for DNS type LOC, #6224" class="gfm gfm-merge_request">ispconfig/ispconfig3!1519</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/dc98d05dcba8abd691090550dc182fd3b8f1d673
check server_id set in tform, not $conf
2021-09-07T16:23:59-06:00
Jesse Norell
jesse@kci.net
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/f7a8707f5fa1ebc806c49a2e33dbc2ccc8456797
rename upd_0094.php patch file to upd_dev_collection.php
2021-09-07T13:49:15-06:00
Jesse Norell
jesse@kci.net
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/9745d5bdc81bcf680696db6c7ef3f34d0acce30c
mail: transport domain must be unique per server
2021-09-07T13:49:15-06:00
Jesse Norell
jesse@kci.net
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/ef73cc6732dbe845cad3d34f2abaf4b959ae2287
Merge branch '5732-email-backup' into 'develop'
2021-09-07T08:12:09+00:00
Marius Burkard
m.burkard@pixcept.de
Limit email backup tab through client limits (#5732)
Closes #5732
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1250" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1250" data-link="false" data-link-reference="false" data-project="1" data-merge-request="2052" data-project-path="ispconfig/ispconfig3" data-iid="1250" data-container="body" data-placement="top" title="Limit email backup tab through client limits (#5732)" class="gfm gfm-merge_request">ispconfig/ispconfig3!1250</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/456db4758bc74fc0186c6ac6d8e9c33a41c24145
Fixed syntax
2021-09-07T08:01:33+00:00
Marius Burkard
m.burkard@pixcept.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/c7ee618315cc59f887b2996fe7a5f44a7c051b8f
Merge branch 'develop' into '5732-email-backup'
2021-09-07T07:45:37+00:00
Marius Burkard
m.burkard@pixcept.de
# Conflicts:
# install/sql/incremental/upd_dev_collection.sql
# install/sql/ispconfig3.sql
# interface/web/client/form/client.tform.php
# interface/web/client/form/client_template.tform.php
# interface/web/client/form/reseller.tform.php
# interface/web/client/lib/lang/br_client.lng
# interface/web/client/lib/lang/br_client_template.lng
# interface/web/client/lib/lang/br_reseller.lng
# interface/web/client/templates/client_edit_limits.htm
# interface/web/client/templates/client_template_edit_limits.htm
# interface/web/client/templates/reseller_edit_limits.htm
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/55699e73690870eb018bcd8b3ab8a06e394dafea
Fixed: Rewrite proxy for ssl targets
2021-09-06T15:23:51+02:00
Ninos
me@ninosego.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/e94ca9f3b9c474e91becb8e1769fe596a763e525
Fixed: Rewrite proxy for ssl targets
2021-09-06T15:16:55+02:00
Ninos
me@ninosego.de
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/17045361659c6d934b2b8b6e1746512c3d7aee26
Merge branch...
2021-09-03T08:25:02+00:00
Marius Burkard
m.burkard@pixcept.de
Merge branch '6226-syntax-error-in-upd_0093-sql-causes-software_-tables-not-to-be-dropped' into 'develop'
Resolve "Syntax error in upd_0093.sql causes software_* tables not to be dropped"
Closes #6226
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1520" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1520" data-link="false" data-link-reference="false" data-project="1" data-merge-request="2974" data-project-path="ispconfig/ispconfig3" data-iid="1520" data-container="body" data-placement="top" title='Resolve "Syntax error in upd_0093.sql causes software_* tables not to be dropped"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1520</a>
https://git.ispconfig.org/elgeorge2k/ispconfig3/-/commit/caef217b5ec315a214e611bd05655f8b52f81687
Update upd_dev_collection.sql
2021-09-03T08:04:49+00:00
Till Brehm
tbrehm@ispconfig.org