commit f297d777
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jun 21 21:07:44 2020 +0200

    Move back out of db class again

commit 0df596d8
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun May 22 21:34:24 2022 +0200

    Move the CLIENTNAMESQL replace out of the way from form postings

    These two are the only ones being used by the respective queries and the onUpdateSave() methods use query() directly.

commit 0d385a62
Merge: 4570911f 5bbec2b9
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat May 21 21:19:51 2022 +0200

    Merge remote-tracking branch 'origin/develop' into patch-interface_concat_client_sql

commit 4570911f
Author: Herman van Rink <rink@initfour.nl>
Date:   Fri Jul 24 22:22:45 2020 +0200

    One new extra occuance of {CLIENTNAMESQL}

commit 6c2d70f9
Merge: 306998f9 94be0a2a
Author: Herman van Rink <rink@initfour.nl>
Date:   Fri Jul 24 22:19:15 2020 +0200

    Merge remote-tracking branch 'origin/stable-3.1' into patch-interface_concat_client_sql

commit 306998f9
Author: Herman van Rink <rink@initfour.nl>
Date:   Tue Jun 23 13:56:25 2020 +0200

    Move {CLIENTNAMESQL} higher up to avoid replacing placeholder data

commit e8ea97b0
Author: Herman van Rink <rink@initfour.nl>
Date:   Tue Jun 23 12:04:45 2020 +0200

    Move get_client_sql_concat_query() to the db class

commit 7a8e2f27
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Jun 22 21:49:05 2020 +0200

    Opt for the SQL pattern that also used the firstname field

commit cac333b4
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Jun 22 21:47:19 2020 +0200

    Add missing str_replace, this should be not only for forms

commit 4c175435
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Jun 22 09:30:05 2020 +0200

    Restore space

commit a33dcbb7
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jun 21 22:41:29 2020 +0200

    Replace long sql snippit with {CLIENTNAMESQL}, batch 3

commit ea61dbaa
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jun 21 22:32:43 2020 +0200

    Replace long sql snippit with {CLIENTNAMESQL}, batch 2

commit 96126368
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jun 21 22:29:36 2020 +0200

    Replace long sql snippit with {CLIENTNAMESQL}

commit 05a08f13
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jun 21 20:57:40 2020 +0200

    Replace the {CLIENTNAMESQL} pattern

commit 3cdc4fbd
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jun 21 21:07:44 2020 +0200

    Add get_client_sql_concat_query function

commit 03c14602
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jun 21 21:08:49 2020 +0200

    cleanup

commit 1d467abd
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu May 21 10:28:12 2020 +0200

    Draft for a interface_concat_client_sql var

commit 7b467d17
Merge: 2ebc2f0a 88edc27e
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat Apr 2 22:11:18 2022 +0200

    Merge remote-tracking branch 'origin/develop' into patch-bind-zonefiles-prefix

commit 2ebc2f0a
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat Jan 15 21:20:04 2022 +0100

    Add new translation strings for !1376

commit bb661ed4
Merge: ef0e2df3 90cd1a2f
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat Jan 15 20:32:02 2022 +0100

    Merge remote-tracking branch 'origin/develop' into patch-bind-zonefiles-prefix

commit ef0e2df3
Merge: 6fb4b6db c40198b1
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Mar 14 22:14:50 2021 +0100

    Merge remote-tracking branch 'origin/develop' into patch-bind-zonefiles-prefix

commit 6fb4b6db
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu Dec 31 14:24:26 2020 +0100

    Change dir to let the dsset- file be saved in the same dir as the key files

commit ac5439aa
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Dec 28 14:54:22 2020 +0100

    Loosen regex to allow just a name prefix

commit f72a4ba9
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Dec 28 12:26:02 2020 +0100

    Strings for master/slave zonefiles prefix

commit 2a319708
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Dec 28 12:13:59 2020 +0100

    Convert zone_file_prefix() and zone_file_prefix() into a config option

    This preserves the default for non-gentoo systems.

commit 165cc8b1
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Dec 28 12:21:01 2020 +0100

    Add strings for bind_keyfiles_dir

commit 19522cdb
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Dec 28 11:36:37 2020 +0100

    Add bind_keyfiles_dir config option

commit 661fac24
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat Jun 4 22:55:19 2022 +0200

    Skip rendering and reloading bind if there are no records, fixes #6350

commit f2f77b2b
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu May 19 13:36:11 2022 +0200

    Fix indend and add comment

commit 0d12df1f
Merge: 66c00034 5bbec2b9
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu May 19 13:34:45 2022 +0200

    Merge remote-tracking branch 'origin/develop' into 2558-two-factor-authentication-followup

commit 66c00034
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat Apr 2 09:13:18 2022 +0200

    Add otp_email_override support

    UI is still to be implemented

Resolve "Two-factor authentication"

Closes #2558

See merge request ispconfig/ispconfig3!1575

Resolve "Send email to reseller when quota is reached"

Closes #6346

See merge request ispconfig/ispconfig3!1608

Add Copy to clipboard button to shell user account and emailboxes

Closes #6230

See merge request !1543

Typo, update ispconfig.css

See merge request ispconfig/ispconfig3!1606

Avoid bashisms in the call to acme.sh

Closes #6326

See merge request ispconfig/ispconfig3!1595

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: Mattia Rizzolo <mattia@mapreri.org>

Resolve "Updated Italian translation (attached)"

Closes #6317

See merge request ispconfig/ispconfig3!1591

Changed 'Client Limit'-check and fixed styling

Closes #6320

See merge request ispconfig/ispconfig3!1593