Skip to content
Verified Commit 4d2934a5 authored by Helmo's avatar Helmo
Browse files

Squashed commit of the following (merging in origin/develop):

commit a07d9a07
Merge: 1169dfe9 153a59f8
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Sep 22 08:53:24 2024 +0000

    Merge branch '6766-database-prefix-is-not-working-correctly' into 'develop'

    Resolve "Database prefix is not working correctly"

    Closes #6766

    See merge request ispconfig/ispconfig3!1944

commit 153a59f8
Author: Till <t.brehm@ispconfig.org>
Date:   Sun Sep 22 10:44:06 2024 +0200

    Revert "De-duplicate onBeforeUpdate and onBeforeInsert"

    This reverts commit ba12d61b.

commit 1169dfe9
Merge: c4adbe90 43986d87
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Sep 22 06:28:12 2024 +0000

    Merge branch 'mysql_sha2' into 'develop'

    feat(mysql): Support the caching_sha2_password auth for newer MySQL servers

    Closes #6702 and #6695

    See merge request ispconfig/ispconfig3!1936

commit c4adbe90
Merge: a1d84058 4b20cfc0
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Sep 7 09:22:43 2024 +0000

    Merge branch 'SGr33n-develop-patch-58297' into 'develop'

    When update ISPConfig, if a custom port is set for the apps vhost domain, then it returns to the default 8081, only on the config file (remains custom on the web panel)

    Closes #5932

    See merge request ispconfig/ispconfig3!1939

commit a1d84058
Merge: 461a5bc6 24813061
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Sep 7 09:21:54 2024 +0000

    Merge branch 'develop' into 'develop'

    Create two new events in the remote lib to allow loading custom plugin fields.

    See merge request ispconfig/ispconfig3!1943

commit 24813061
Author: Michael <mepstein@mediabox.cl>
Date:   Fri Sep 6 20:06:12 2024 -0400

    Create two new events in the remote lib to allow loading custom plugin fields.

commit 461a5bc6
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Aug 8 13:27:29 2024 +0000

    Update CONTRIBUTING.md

commit 4a49e012
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Aug 8 10:54:58 2024 +0000

    Update CONTRIBUTING.md

commit 0db3ec53
Merge: 29c4115d 264129f6
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Tue Aug 6 15:30:26 2024 +0000

    Merge branch '3.2.12p1' into 'develop'

    Merge changes from 3.2.12p1 into develop

    Closes #6754, #6755, and #6727

    See merge request ispconfig/ispconfig3!1941

commit 4b20cfc0
Author: Sergio <sdefalco@gmail.com>
Date:   Thu Aug 1 13:42:18 2024 +0000

    Fix #5932

commit 29c4115d
Merge: c865f18f c93ce2ac
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Jul 26 14:18:04 2024 +0000

    Merge branch '6754-datalog' into 'develop'

    fix stored XSS issue in data log history detail page

    Closes #6754

    See merge request ispconfig/ispconfig3!1938

commit 43986d87
Author: Daniel Jagszent <daniel@jagszent.de>
Date:   Thu Jul 25 17:33:36 2024 +0200

    Reformat code & make it PHP 5.4 compatible. #6754

commit b4274a9c
Author: Daniel Jagszent <daniel@jagszent.de>
Date:   Thu Jul 25 06:26:20 2024 +0200

    mysql_clientdb_plugin: refactor & fix many bugs #6754

commit fa21a45e
Author: Daniel Jagszent <daniel@jagszent.de>
Date:   Tue Jul 23 02:10:21 2024 +0200

    Support the caching_sha2_password auth for newer MySQL servers #6754

commit c93ce2ac
Author: Daniel Jagszent <daniel@jagszent.de>
Date:   Thu Jul 25 06:48:20 2024 +0200

    fix stored XSS issue in data log history detail page

    fixes #6754

commit c865f18f
Merge: d228f63f 0e6d59da
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Jul 19 09:53:43 2024 +0000

    Merge branch 'misc-updates' into 'develop'

    Misc updates

    See merge request ispconfig/ispconfig3!1935

commit 0e6d59da
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu Jul 18 23:35:38 2024 +0200

    Add missing name field, used in the delete query three lines down.

commit a80ceba9
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu Jul 18 23:23:12 2024 +0200

    Improve pattern match to not match things like webmail.example.com

    Such a website symlink would trigger warnings such as:
    Undefined array key "webmail.example.com" in /usr/local/ispconfig/server/lib/classes/cron.d/100-monitor_hd_quota.inc.php on line 124

commit 05defde3
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu Jul 18 23:22:16 2024 +0200

    fix indent

commit 07d0a0f7
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu Jul 18 23:22:01 2024 +0200

    Fix PHP Deprecated:  Creation of dynamic property cronjob_quota_notify::$_tools is deprecated in

commit ecfdb111
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jun 9 15:30:39 2024 +0200

    typo calculare

commit d228f63f
Merge: 5db4716d 1ed3fbd4
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Jul 11 17:34:50 2024 +0000

    Merge branch 'develop' into 'develop'

    Change database username length to 32 from 16

    See merge request ispconfig/ispconfig3!1925

commit 5db4716d
Merge: 845de722 62a6d8d2
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Jul 11 17:33:59 2024 +0000

    Merge branch '6737-Remove-space-before-comma-in-master.cf-at-smtpd_client_restrictions' into 'develop'

    Space before comma in postfix master configuration file at smtpd_client_restrictions, #6737

    Closes #6737

    See merge request ispconfig/ispconfig3!1930

commit 845de722
Merge: f83f54f5 952f58af
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Jul 11 17:33:21 2024 +0000

    Merge branch '6736-remove-double-comma-in-master.cf-at-smtpd_helo_restrictions' into 'develop'

    Update 3 files

    Closes #6736

    See merge request ispconfig/ispconfig3!1932

commit f83f54f5
Merge: 929aea65 b0b0e6dc
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Jul 11 17:32:36 2024 +0000

    Merge branch '6739-correct-indentation-of-serveralias-in-apache-vhost-files' into 'develop'

    Indentation wrong on ServerAlias with apache vhosts, #6739

    Closes #6739

    See merge request ispconfig/ispconfig3!1933

commit b0b0e6dc
Author: C V <cv-web@4-werk.de>
Date:   Wed Jul 10 08:14:56 2024 +0000

    Update apache2_plugin.inc.php

commit 952f58af
Author: C V <cv-web@4-werk.de>
Date:   Wed Jul 10 06:47:48 2024 +0000

    Update file gentoo_postfix.conf.master

commit 62a6d8d2
Author: C V <cv-web@4-werk.de>
Date:   Wed Jul 10 06:46:35 2024 +0000

    Update 4 files

    - /install/tpl/debian_postfix.conf.master
    - /install/tpl/fedora_postfix.conf.master
    - /install/tpl/gentoo_postfix.conf.master
    - /install/tpl/opensuse_postfix.conf.master

commit 32bcf809
Author: C V <cv-web@4-werk.de>
Date:   Wed Jul 10 06:30:35 2024 +0000

    Update 3 files

    - /install/tpl/debian_postfix.conf.master
    - /install/tpl/fedora_postfix.conf.master
    - /install/tpl/opensuse_postfix.conf.master

commit 929aea65
Merge: 3ab3c288 d19cc6bd
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Tue Jul 9 11:47:35 2024 +0000

    Merge branch '6735-prettify-rspamd_antivirus.conf.master' into 'develop'

    Prettify for easy readability, #6735

    Closes #6735

    See merge request ispconfig/ispconfig3!1929

commit d19cc6bd
Author: C V <cv-web@4-werk.de>
Date:   Tue Jul 9 10:23:46 2024 +0000

    Prettify for easy readability

commit 3ab3c288
Merge: 257664f7 3e8e99d6
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Jul 8 09:13:10 2024 +0000

    Merge branch '6729-cleanup-comment' into 'develop'

    Cleanup comment we generated, #6729

    Closes #6729

    See merge request ispconfig/ispconfig3!1928

commit 257664f7
Merge: 8fbb9525 0a40c5cc
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Jul 8 09:11:36 2024 +0000

    Merge branch '6731-placeholder' into 'develop'

    Fix placeholder use for empty config, #6698

    Closes #6698

    See merge request ispconfig/ispconfig3!1926

commit 3e8e99d6
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jul 7 15:16:33 2024 +0200

    Cleanup comment we generated, #6729

commit 8fbb9525
Merge: bcb8eb1e c9ff28a7
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Jul 6 15:40:49 2024 +0000

    Merge branch '6733-external-cname' into 'develop'

    Warn about CNAME target missing, #6733

    Closes #6733

    See merge request ispconfig/ispconfig3!1927

commit c9ff28a7
Author: Herman van Rink <rink@initfour.nl>
Date:   Fri Jul 5 22:52:20 2024 +0200

    Warn about CNAME target missing, #6733

commit 0a40c5cc
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Jul 3 14:49:32 2024 +0200

    Fix placeholder use for empty config, #6731

commit 1ed3fbd4
Author: Wulff D. Heiss <styx@brr-nb>
Date:   Wed Jul 3 12:02:07 2024 +0200

    Change database username length to 32 from 16
parent cfc55486
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment