Commit Graph

908 Commits

Author SHA1 Message Date
Vicente 5fb98719e8 Revert "Squashed commit of the following:"
This reverts commit fb20fd48fb.
2023-04-21 14:56:52 +02:00
Vicente fb20fd48fb Squashed commit of the following:
commit 8f28666916
Merge: 428b9175 3eaa5a62
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Thu Apr 20 16:49:17 2023 +0200

    Merge pull request #5195 from mailcow/staging

    2023-04b

commit 3eaa5a626c
Merge: 8c79056a 22a0479f
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Thu Apr 20 14:20:03 2023 +0200

    Merge pull request #5187 from mailcow/fix-5185

    Nextcloud helperscript - redo PHP check

commit 8c79056a94
Merge: ed076dc2 0e24c3d3
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Thu Apr 20 14:19:19 2023 +0200

    Merge pull request #5194 from mailcow/renovate/nextcloud-server-26.x

    Update dependency nextcloud/server to v26.0.1

commit ed076dc23e
Merge: be2286c1 3510d561
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Thu Apr 20 13:50:57 2023 +0200

    Merge pull request #5186 from goodygh/datatables_sorting

    [Web] Datatables sorting

commit be2286c11c
Author: FreddleSpl0it <patschul@posteo.de>
Date:   Thu Apr 20 13:41:11 2023 +0200

    [Dockerapi] fix maildir cleanup for domains

commit 0e24c3d300
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Apr 20 11:36:01 2023 +0000

    Update dependency nextcloud/server to v26.0.1

    Signed-off-by: milkmaker <milkmaker@mailcow.de>

commit e1d8df6580
Author: FreddleSpl0it <patschul@posteo.de>
Date:   Thu Apr 20 13:20:51 2023 +0200

    [Web] check mailbox before replacing sogo_static_view

commit 04a08a7d69
Merge: 026b2783 3c0c8aa0
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Thu Apr 20 12:32:42 2023 +0200

    Merge pull request #5193 from mailcow/feat/update-sogo

    [SOGo] update sogo 5.8.2.20230419

commit 3c0c8aa01f
Author: FreddleSpl0it <patschul@posteo.de>
Date:   Thu Apr 20 12:07:21 2023 +0200

    [SOGo] update sogo 5.8.2.20230419

commit 026b278357
Merge: 00ac61f0 4121509c
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Thu Apr 20 11:34:41 2023 +0200

    Merge pull request #5183 from mailcow/fix/add-mbox-performance

    [Web] optimizing mailbox add/edit/delete performance

commit 4121509ceb
Author: FreddleSpl0it <patschul@posteo.de>
Date:   Thu Apr 20 11:28:59 2023 +0200

    [Web] optimizing update_sogo_static_view function

commit 00ac61f0a4
Merge: 4bb0dbb2 6986e775
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Wed Apr 19 17:31:05 2023 +0200

    Merge pull request #5184 from bdwebnet/fix/ui-allowed-protocols

    Added dropdown divider to "allowed protocols" selection on mailbox page

commit 4bb0dbb2f7
Merge: 13b6df74 20fc9eaf
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Wed Apr 19 17:26:54 2023 +0200

    Merge pull request #5191 from shiz0/patch-1

    Fix Typo

commit 13b6df74af
Merge: 5c025bf8 b4a9df76
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Wed Apr 19 17:23:26 2023 +0200

    Merge pull request #5174 from bdwebnet/staging

    Fix error  "Deprecated: Using ${var} in strings is deprecated, use {$…

commit 5c025bf865
Author: FreddleSpl0it <patschul@posteo.de>
Date:   Wed Apr 19 17:03:04 2023 +0200

    [Rspamd] rollback to 3.4

commit 20fc9eaf84
Author: Hannes Happle <info@h2-it.de>
Date:   Sun Apr 16 14:32:44 2023 +0200

    Fix Typo

commit 22a0479fab
Author: Peter <magic@kthx.at>
Date:   Thu Apr 13 21:11:40 2023 +0200

    Redo the PHP check grep

commit 3510d5617d
Author: goodygh <github@goodi.ch>
Date:   Thu Apr 13 19:18:04 2023 +0200

    Fix sorting for active relayhost

commit 236d627fbd
Author: goodygh <github@goodi.ch>
Date:   Thu Apr 13 19:14:20 2023 +0200

    Fix sorting for active transport map

commit 99739eada0
Author: goodygh <github@goodi.ch>
Date:   Thu Apr 13 19:01:03 2023 +0200

    Fix sorting for active fowrardinghoststable

commit 7bfef57894
Author: goodygh <github@goodi.ch>
Date:   Thu Apr 13 18:54:59 2023 +0200

    Fix sorting for active and tla on admins

commit d9dfe15253
Author: goodygh <github@goodi.ch>
Date:   Thu Apr 13 18:54:08 2023 +0200

    Fix sorting for active and tla on domain-admins

commit 3fe8aaa719
Author: goodygh <github@goodi.ch>
Date:   Thu Apr 13 18:14:18 2023 +0200

    Fix sorting for active tls-policy-map

commit 78a8fac6af
Author: goodygh <github@goodi.ch>
Date:   Thu Apr 13 18:10:21 2023 +0200

    Fix sorting for active bcc-map and recipient-map

commit 6986e7758f
Author: bd <51322242+bdwebnet@users.noreply.github.com>
Date:   Thu Apr 13 17:33:28 2023 +0200

    Added dropdown divider to "allowed protocols" selection on mailbox page

commit b4a9df76b8
Merge: bdb07061 f681fcf1
Author: BD <51322242+bdwebnet@users.noreply.github.com>
Date:   Thu Apr 13 17:22:13 2023 +0200

    Merge branch 'mailcow:staging' into staging

commit d9d958356a
Author: FreddleSpl0it <patschul@posteo.de>
Date:   Thu Apr 13 14:35:55 2023 +0200

    [Web] optimizing update_sogo_static_view function

commit 96f954a4e2
Author: goodygh <github@goodi.ch>
Date:   Wed Apr 12 00:36:46 2023 +0200

    Fix sorting for active syncjobs

commit 44585e1c15
Author: goodygh <github@goodi.ch>
Date:   Wed Apr 12 00:23:53 2023 +0200

    Fix sorting datatable in domain aliases

commit c737ff4180
Author: goodygh <github@goodi.ch>
Date:   Wed Apr 12 00:21:27 2023 +0200

    Fix sorting datatable in aliases

commit 025279009d
Author: goodygh <github@goodi.ch>
Date:   Wed Apr 12 00:17:41 2023 +0200

    Fix sorting for active resources

commit a9dc13d567
Author: goodygh <github@goodi.ch>
Date:   Wed Apr 12 00:15:16 2023 +0200

    Fix sorting datatable in mailbox templates

commit c3ed01c9b5
Author: goodygh <github@goodi.ch>
Date:   Tue Apr 11 23:49:50 2023 +0200

    Fix sorting for active mailboxes

commit bd0b4a521e
Author: goodygh <github@goodi.ch>
Date:   Tue Apr 11 23:42:43 2023 +0200

    Fix sorting datatable in domain templates

commit 800a0ace71
Author: goodygh <github@goodi.ch>
Date:   Tue Apr 11 23:19:56 2023 +0200

    Fix sorting for active domain in domains table

commit db97869472
Author: goodygh <github@goodi.ch>
Date:   Tue Apr 11 23:18:13 2023 +0200

    Datatable hide sorting value

commit f681fcf154
Author: milkmaker <milkmaker@mailcow.de>
Date:   Tue Apr 11 17:38:39 2023 +0200

    [Web] Updated lang.cs-cz.json (#5177)

    Co-authored-by: utaxiu <kontakt@malyjakub.cz>

commit db1b5956fc
Merge: 469f959e 80dacc01
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Tue Apr 11 06:35:41 2023 +0200

    Merge pull request #5133 from FELDSAM-INC/feldsam/bs5-related-fixes

    BS5 related fixes

commit bdb07061ed
Author: BD <51322242+bdwebnet@users.noreply.github.com>
Date:   Sat Apr 8 17:29:34 2023 +0200

    Fix error  "Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /web/sogo-auth.php on line 63"

commit 428b917579
Merge: 028ef228 469f959e
Author: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
Date:   Mon Apr 3 20:15:46 2023 +0200

    Merge pull request #5166 from mailcow/staging

    Hotfix php8.2 nextcloud < 26

commit 469f959e96
Merge: 0194c39b b68e189d
Author: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
Date:   Mon Apr 3 20:10:05 2023 +0200

    Merge pull request #5164 from mailcow/fix-5163

    Add a check for PHP>=8.2 errormsg

commit b68e189d97
Author: Peter <magic@kthx.at>
Date:   Mon Apr 3 19:03:13 2023 +0200

    Add a check for PHP>=8.2 errormsg

commit 028ef22878
Merge: 229303c1 0194c39b
Author: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
Date:   Mon Apr 3 14:55:55 2023 +0200

    Merge pull request #5162 from mailcow/staging

    Update 2023-04

commit 80dacc015a
Author: Kristian Feldsam <feldsam@gmail.com>
Date:   Mon Mar 20 01:37:49 2023 +0100

    [web] fixed mailbox/user settings buttons styling

    Signed-off-by: Kristian Feldsam <feldsam@gmail.com>

    [web] fixed mailbox/user settings buttons styling

    Signed-off-by: Kristian Feldsam <feldsam@gmail.com>

commit 0194c39bd5
Merge: ae46a877 f53ca24b
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Fri Mar 31 08:16:57 2023 +0200

    Merge pull request #5158 from mailcow/feat/sogo-5.8.2

    [SOGo] Update to 5.8.2

commit f53ca24bb0
Author: FreddleSpl0it <patschul@posteo.de>
Date:   Thu Mar 30 16:00:21 2023 +0200

    [SOGo] Update to 5.8.2

commit ae46a877d3
Merge: fd0205aa 400939fa
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Thu Mar 30 09:05:52 2023 +0200

    Merge pull request #5157 from mailcow/feat/netfilter-1.52

    [Netfilter] Update to 1.52

commit 400939faf6
Author: FreddleSpl0it <patschul@posteo.de>
Date:   Thu Mar 30 08:44:38 2023 +0200

    [Netfilter] Update to 1.52

commit fd0205aafd
Merge: e367a8ce 096e2a41
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Thu Mar 30 07:53:33 2023 +0200

    Merge pull request #5127 from th-joerger/feature/bantime-increment

    [Netfilter] Implemented exponentially incrementing bantime

commit e367a8ce24
Merge: 3d2483ca 26c34b48
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Thu Mar 30 07:52:00 2023 +0200

    Merge pull request #5153 from mailcow/fix/del-vmail-index

    [Dockerapi] delete vmail_index on maildir cleanup

commit 096e2a41e9
Author: Thorbjörn Jörger <thor@joerger.dev>
Date:   Wed Mar 29 17:09:25 2023 +0200

    Push verified options to redis after each check

commit e010f08143
Author: Thorbjörn Jörger <thor@joerger.dev>
Date:   Wed Mar 29 15:18:11 2023 +0200

    verify options after loading them, set defaults if options are missing or invalid

commit 3d2483ca37
Merge: 535dd235 f77c6541
Author: Patrick Schult <75116288+FreddleSpl0it@users.noreply.github.com>
Date:   Wed Mar 29 08:13:11 2023 +0200

    Merge pull request #5093 from brunoleon/fix_snat

    Fix SNAT never being added because of exception

commit 535dd23509
Merge: 4336a99c 9fd4aa93
Author: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
Date:   Tue Mar 28 11:44:59 2023 +0200

    Merge pull request #5139 from mailcow/renovate/mailcow-rspamd-1.x

    Update mailcow/rspamd Docker tag to v1.93

commit 4336a99c6a
Author: DerLinkman <derlinkman@gmail.com>
Date:   Tue Mar 28 11:40:00 2023 +0200

    [Nextcloud] Changed default X-Robots Tag behavior

commit 4cd5f93cdf
Author: DerLinkman <derlinkman@gmail.com>
Date:   Tue Mar 28 11:22:49 2023 +0200

    Fixed broken pipe errors in nextcloud.sh

commit 67955779b0
Author: DerLinkman <derlinkman@gmail.com>
Date:   Tue Mar 28 11:17:59 2023 +0200

    Fix broken pipe error in reset-admin.sh

commit 26c34b484a
Author: FreddleSpl0it <patschul@posteo.de>
Date:   Tue Mar 28 11:01:14 2023 +0200

    increase dockerapi image

commit 4021613059
Author: FreddleSpl0it <patschul@posteo.de>
Date:   Tue Mar 28 10:59:08 2023 +0200

    delete vmail_index when mbox is deleted

commit e891bf8411
Merge: f7798d1a 5bc3d935
Author: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
Date:   Mon Mar 27 10:40:40 2023 +0200

    Merge pull request #5138 from th-joerger/feature/pubsub-exception

    [netfilter] add pubsub exception

commit f7798d1aac
Merge: d11f0026 db2fb128
Author: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
Date:   Mon Mar 27 10:13:42 2023 +0200

    Merge pull request #5099 from mailcow/feat/phpfpm-8.2

    Update to PHP 8.2

commit d11f00261b
Merge: ce6742c6 22cd12f3
Author: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
Date:   Mon Mar 27 10:12:55 2023 +0200

    Merge pull request #5142 from mailcow/renovate/nextcloud-server-26.x

    Update dependency nextcloud/server to v26

commit 22cd12f37b
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Sat Mar 25 18:48:22 2023 +0000

    Update dependency nextcloud/server to v26

    Signed-off-by: milkmaker <milkmaker@mailcow.de>

commit db2fb12837
Author: Peter <magic@kthx.at>
Date:   Fri Mar 24 16:08:19 2023 +0100

    Install sysvsem for Nextcloud 26

commit e808e595eb
Author: Peter <magic@kthx.at>
Date:   Fri Mar 24 16:05:35 2023 +0100

    Update dependency composer/composer to v2.5.5

commit ce6742c676
Merge: 62f36035 cf3dc584
Author: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
Date:   Thu Mar 23 19:38:23 2023 +0100

    Merge pull request #5147 from mailcow/renovate/nextcloud-server-25.x

    Update dependency nextcloud/server to v25.0.5

commit cf3dc584d0
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Mar 23 14:18:29 2023 +0000

    Update dependency nextcloud/server to v25.0.5

    Signed-off-by: milkmaker <milkmaker@mailcow.de>

commit 62f3603588
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Mar 22 15:00:55 2023 +0100

    Update actions/stale action to v8 (#5143)

    Signed-off-by: milkmaker <milkmaker@mailcow.de>
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 9fd4aa93e9
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Mar 21 10:32:21 2023 +0000

    Update mailcow/rspamd Docker tag to v1.93

    Signed-off-by: milkmaker <milkmaker@mailcow.de>

commit 5bc3d93545
Author: Thorbjörn Jörger <thor@joerger.dev>
Date:   Tue Mar 21 11:12:07 2023 +0100

    log exception of redis pubsub subscription

commit c28a6b89f0
Author: Thorbjörn Jörger <thor@joerger.dev>
Date:   Fri Mar 17 18:22:16 2023 +0100

    Added ban_time_increment and max_ban_time to UI

commit 1233613bea
Author: Thorbjörn Jörger <thor@joerger.dev>
Date:   Fri Mar 17 14:41:37 2023 +0100

    implemented handling of max_bantime and ban_time_increment flag

commit 0206e0886c
Author: Thorbjörn Jörger <thor@joerger.dev>
Date:   Fri Mar 17 01:33:40 2023 +0100

    implemented exponentially incrementing bantime, removed active_window code that did nothing, cleanly initialized dictionary

commit f6d135fbad
Author: DerLinkman <derlinkman@gmail.com>
Date:   Mon Mar 20 12:05:11 2023 +0100

    [Update.sh] Fix docker compose detection + added failover

commit f7da314dcf
Merge: 0f59d495 e6ce5e88
Author: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
Date:   Mon Mar 20 11:08:11 2023 +0100

    Merge pull request #5134 from mailcow/fix/generate-config-dev

    [Generate.sh] Fixed broken pipe error message

commit e6ce5e88f7
Author: DerLinkman <derlinkman@gmail.com>
Date:   Mon Mar 20 10:57:40 2023 +0100

    [Generate.sh] Fixed broken pipe error message

commit e5e6418be8
Author: Kristian Feldsam <feldsam@gmail.com>
Date:   Mon Mar 20 01:30:06 2023 +0100

    [web] fixed tooltips in ajax loaded alias table

    Signed-off-by: Kristian Feldsam <feldsam@gmail.com>

commit 6507b53bbb
Author: Kristian Feldsam <feldsam@gmail.com>
Date:   Mon Mar 20 01:29:01 2023 +0100

    [web] fix mailbox badge height

    Signed-off-by: Kristian Feldsam <feldsam@gmail.com>

commit 0f59d4952b
Author: milkmaker <milkmaker@mailcow.de>
Date:   Fri Mar 17 19:13:49 2023 +0100

    Translations update from Weblate (#5131)

    * [Web] Updated lang.da-dk.json

    Co-authored-by: Victor Pahuus Petersen <dibbohh@gmail.com>
    Co-authored-by: milkmaker <milkmaker@mailcow.de>

    * [Web] Updated lang.fr-fr.json

    Co-authored-by: UpSilot <alexandre+weblate@kilobit.fr>
    Co-authored-by: milkmaker <milkmaker@mailcow.de>

    ---------

    Co-authored-by: Victor Pahuus Petersen <dibbohh@gmail.com>
    Co-authored-by: UpSilot <alexandre+weblate@kilobit.fr>

commit a5b8f1b7f7
Author: Peter <magic@kthx.at>
Date:   Tue Feb 28 20:08:33 2023 +0100

    Update to PHP 8.2

commit f77c65411d
Author: Bruno Léon <bruno.leon@unyonsys.com>
Date:   Mon Feb 27 12:04:32 2023 +0100

    Fix SNAT never being added because of exception

    Some firewall rule object (iptc) do not have a parameter
    attribute, which results in an exception being triggered,
    and the mailcow SNAT rule to never be created.

    Firewall rules that trigger such exception are:
    - -A POSTROUTING -s 192.168.122.0/24 -d 224.0.0.0/24 -j RETURN

    This commit just verify attribute presence, and skip the rule
    properly instead of triggering an exception.
2023-04-21 14:51:04 +02:00
Niklas Meyer 38291d123f [DB] Fix espacing of special db names during upgrade 2023-02-14 10:11:55 +01:00
Patrick Schult 1071bb8230
Merge pull request #4967 from FELDSAM-INC/feldsam/sso
[Web] Implemented SSO for domain admins
2023-02-02 12:12:53 +01:00
FreddleSpl0it e8fd34d31f
[Web] webauthn add lang strings 2023-02-02 11:28:51 +01:00
FreddleSpl0it 64ac6a8891
[Web] Skip update_sogo_static_view if sogo is disabled 2023-01-31 10:54:16 +01:00
FreddleSpl0it d62c275004
[Web] match PAGINATION_SIZE to an existing datatable option 2023-01-31 09:49:18 +01:00
Kristian Feldsam 5bf62481d5 [Web] Implemented SSO for domain admins
Signed-off-by: Kristian Feldsam <feldsam@gmail.com>

Revert "[Web] Implemented SSO for domain admins"

This reverts commit 6860dc8ebe2c8f53d77df5bca7787f7cb3bb4ee0.

Signed-off-by: Kristian Feldsam <feldsam@gmail.com>
2023-01-26 15:54:44 +01:00
FreddleSpl0it 36fa5dc633 [Web] fix domain admins cant delete tags 2023-01-16 09:07:28 +01:00
FreddleSpl0it 1e98784eee [Web] Opt-In for third party ip_check 2023-01-06 12:09:15 +01:00
FreddleSpl0it dd9296ffc2 [Web] fix extend_sender_acl issue for domainadmins 2023-01-06 11:07:44 +01:00
Tomy Hsieh 13bdd4ad0b
🛠 fix: Locale decision algorithm 2022-12-25 16:56:43 +08:00
DerLinkman aa7888c37d Updated DB Schemata + reverted escape HTML of alert boxes 2022-12-23 14:47:27 +01:00
DerLinkman f4731eecdb Cleanup + Language Fixes 2022-12-12 10:49:00 +01:00
DerLinkman d55994b66a Merge branch 'staging' into nightly 2022-12-01 21:06:19 +01:00
bluewalk 57a5a9baeb Updated DB version and make sure default sound is "pushover" when null 2022-11-17 21:14:44 +01:00
bluewalk 65c74c75c7 Added SENDER_ADDRESS and SENDER_NAME as variables for messages 2022-11-17 21:01:18 +01:00
FreddleSpl0it ef392ef6ba add demo_mode for mailcow ui 2022-11-17 08:36:03 +01:00
FreddleSpl0it f52ab69a5b change default template creation 2022-11-16 15:29:39 +01:00
FreddleSpl0it c8f69ffe77 show created_on, last_modified for domain, mailbox 2022-11-11 09:22:58 +01:00
FreddleSpl0it 79982e0e8d add template feature for domains and mailboxes 2022-11-10 16:22:18 +01:00
Niklas Meyer 996b2db514
Merge pull request #4826 from mailcow/staging
Automatic PR to nightly from 2022-10-26T07:46:18Z
2022-10-26 12:57:17 +02:00
FreddleSpl0it 1e08b4ece6 fix encoding failures of parsed text_plain mail 2022-10-26 12:33:22 +02:00
Niklas Meyer f8d45de749
Merge pull request #4657 from tomy0000000:master
🌐 Add Traditional Chinese Translation
2022-10-20 11:27:58 +02:00
DerLinkman b6760e19b7 Merge branch 'feature/bootstrap5' into nightly 2022-10-20 11:12:17 +02:00
DerLinkman a334f33b35 Merge PR 4657 into language-change 2022-10-20 10:58:51 +02:00
Tomy Hsieh cf38d6ca69
🛠 fix: Improve language preference algo 2022-10-06 23:22:54 +08:00
Tomy Hsieh 905993d66e
🛠 fix: Language detection 2022-10-06 22:21:12 +08:00
DerLinkman ba9f2bc376 Update Twig to 3.4.3 2022-09-30 12:21:31 +02:00
FreddleSpl0it 27e7407407 Update Twig to 3.4.3 2022-09-30 11:03:05 +02:00
Tomy Hsieh 7d46de33d8
Merge from upstream branch 'staging'
# Conflicts:
#	data/web/inc/vars.inc.php
2022-09-30 16:03:49 +08:00
DerLinkman cf5fa96a93 Merge branch 'staging' into nightly 2022-09-01 13:57:39 +02:00
FreddleSpl0it a40df1ff87 fix tfa modal trigger from dav/eas login 2022-09-01 09:53:08 +02:00
FreddleSpl0it a161aa2c92 remove testing debug log 2022-08-31 11:37:45 +02:00
FreddleSpl0it 2ed453a400 fix mailbox tfa 2022-08-31 11:31:55 +02:00
DerLinkman ecc16c69e6 Merge branch 'nightly' into feature/bootstrap5 2022-08-29 14:37:25 +02:00
milkmaker 0c11cf747a
Translations update from Weblate (#4722)
* [Web] Updated lang.cs.json [CI SKIP]

Co-authored-by: Vojtěch Kaizr <wojtishek@gmail.com>
Co-authored-by: milkmaker <milkmaker@mailcow.de>

* [Web] Updated lang.fr.json [CI SKIP]

Co-authored-by: milkmaker <milkmaker@mailcow.de>
Co-authored-by: ppelleti2 <pierre@ppelleti.fr>

* [Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Updated lang.tr.json [CI SKIP]

[Web] Added lang.tr.json [CI SKIP]

Co-authored-by: Peter <magic@kthx.at>
Co-authored-by: milkmaker <milkmaker@mailcow.de>
Co-authored-by: therudeboy <abdullahozcelikisreklam@gmail.com>

* [Web] Updated lang.ro.json [CI SKIP]

Co-authored-by: Vlad M <vlad+mailcow@manoila.co.uk>
Co-authored-by: milkmaker <milkmaker@mailcow.de>

* [Web] Updated lang.it.json [CI SKIP]

Co-authored-by: Peter <magic@kthx.at>

* [Web] Turkish translation

* [Web] Turkish translation

Co-authored-by: Vojtěch Kaizr <wojtishek@gmail.com>
Co-authored-by: ppelleti2 <pierre@ppelleti.fr>
Co-authored-by: Peter <magic@kthx.at>
Co-authored-by: therudeboy <abdullahozcelikisreklam@gmail.com>
Co-authored-by: Vlad M <vlad+mailcow@manoila.co.uk>
2022-08-25 18:15:27 +02:00
Patrick Schult 6d36475ed3
Merge pull request #4725 from mailcow/feature/nightly-switch
[Update.sh] Nightly Version Switch implementation + Composev2 User Decision
2022-08-25 14:58:16 +02:00
Patrick Schult 02512e0f4f
Merge pull request #4685 from FreddleSpl0it/tfa-patch
Update TFA flow
2022-08-25 14:38:37 +02:00
FreddleSpl0it 555f4a8a6d [Web] Mailbox TFA fix 2022-08-25 14:26:45 +02:00
DerLinkman 77f9947613 Readded footer + vars. 2022-08-24 14:37:00 +02:00
FreddleSpl0it 77e6124b00 [BS5] move showWhatsNewModal 2022-08-23 14:24:10 +02:00
FreddleSpl0it 7f70b0f703 [BS5] add container disk and network stats 2022-08-22 16:08:01 +02:00
FreddleSpl0it a3c0737ba8 [BS5] add host statistics 2022-08-09 20:29:33 +02:00
Tomy Hsieh 7b57b3392c
switch to IETF language tag 2022-08-09 15:44:09 +08:00
Erisa A 4c10525078
[Web] Update keyHandle max length to 1023 (#4696)
https://w3c.github.io/webauthn/#credential-id

Co-authored-by: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com>
2022-07-26 09:16:23 +02:00
FreddleSpl0it c8620a066d
yubi_otp undo authenticator selection 2022-07-15 16:45:28 +02:00
FreddleSpl0it 0342ae926c
exclude oauth clients & app passwords from mailbox tfa 2022-07-14 18:55:35 +02:00
FreddleSpl0it be08742653
exclude oauth clients & app passwords from mailbox tfa 2022-07-14 18:37:21 +02:00
FreddleSpl0it 753cde0b85
parse host from url for webauthn library 2022-07-14 09:40:02 +02:00