Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Two-factor authentication #13000

Merged
merged 111 commits into from
Dec 9, 2023
Merged

Two-factor authentication #13000

merged 111 commits into from
Dec 9, 2023

Conversation

i-just
Copy link
Contributor

@i-just i-just commented Mar 28, 2023 •
edited by angrybrad
Loading

Description

2FA and WebAuthn support for Craft 5.
2FA methods are: Google Authenticator (default) and Email Code (code sent via email).

  • You can enable/enforce MFA on a per-user and per-user group basis

Screenshot 2023-03-28 at 16 10 10

  • If you enable MFA for, e.g. all admins, the next time they log in, they will be asked to provide the TOTP. They can use ‘Email Code’ to have the code emailed to them, or (by default) they will be provided with a setup screen for Google Authenticator
  • You can only set up a Security Key for WebAuthn once you’re logged in. WebAuthn is grouped under MFA though the way I (and Andris) chose to use it is - you don’t need a password to login via WebAuthn, so it looks like a single-step login.

Screenshot 2023-03-28 at 16 10 28

  • Google Authenticator and Security Key for WebAuthn can only be set up for the currently logged in user (as in you can’t set it up on someone’s behalf)
  • If MFA is turned on and your session expires, and you see the modal when visiting the control panel, you have to MFA in again.
  • Email content for “Email Code” is content managed like other system emails (e.g. forgot password, account activation etc)
  • Developers can register new MFA types/manipulate existing ones via new EVENT_REGISTER_MFA_TYPES

Other things to note:

Related issues

@i-just
MFA flow WIP
192a765
@i-just
MFA authentication component WIP
8b6ff5c
@i-just
GA OPT continued, EmailCode added
f9221d3
@i-just
started hooking up alternative options
8946b1e
@i-just
alternative mfa options hookup cont.
0db29e5
@i-just
started setting up user edit form
216c2a5
@i-just
rename all things
daf3d36
@i-just
separated js, tweaks
7221624
@i-just
tweaks
434be1f
@i-just
mfa option to mfa type
ed937e8
@i-just
save the user requireMfa property
37a75b7
@i-just
added configurable mfa type
45ff8b7
@i-just
tweaks and translations
27078ed
@i-just
compiled assets
aeb2525
@i-just
Squashed commit of the following:
ed8663a 
commit a7aa5d6dfd061b570a4764f2a1fa05d5a7d0bb75
Merge: 12b254d454 0c7834c4a3
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 10:08:48 2023 -0800

    Merge tag '4.4.0' into develop

    4.4.0

    # gpg: Signature made Wed Mar  8 10:08:47 2023 PST
    # gpg:                using RSA key B6C810CBE206E036FB68F3CD5E86D0CED64C7093
    # gpg: Good signature from "Brandon Kelly <[email protected]>" [ultimate]

commit 0c7834c4a316d2f7537317e4e14989f39da05a76
Merge: 34d57fdadc bb964a43e9
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 10:08:46 2023 -0800

    Merge branch 'release/4.4.0' into main

commit bb964a43e9d61a26b99dc543a5cbcb74ed70bdac
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 10:08:25 2023 -0800

    Finish 4.4.0

commit 99642a257c022b2775fc1da7c9bcc4050895d6cb
Merge: bcd6bf07b6 3c05446b1f
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 10:07:20 2023 -0800

    Merge branch 'v3' of https://github.com/craftcms/cms into release/4.4.0

    # Conflicts:
    #	CHANGELOG-WIP.md

commit 3c05446b1ff0832cef072754617d3b84a6413762
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 10:03:20 2023 -0800

    Remove CHANGELOG-WIP

commit bcd6bf07b618a3cdfcd5f55fe337a96f7fa17bc2
Merge: b8c47821b9 fbcaef36f3
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 10:01:33 2023 -0800

    Merge branch 'v3' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/config/app.php

commit fbcaef36f3d4ab166faf60714973c94780b70cd0
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 10:00:09 2023 -0800

    Finish 3.8.0

commit b8c47821b91645a5e9e1a1240e8a845150f2100d
Merge: f9281a814f c92e0eff16
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 09:56:18 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map

commit c92e0eff1689d2f73b569db86ca3c7caea0d89db
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 09:55:04 2023 -0800

    Fixed #12820

commit f9281a814f789d1585deaf8619a2b72669fcd028
Merge: 432f2182bc 12b254d454
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 09:42:44 2023 -0800

    Merge branch 'develop' into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit 12b254d454e2b78ac9895eb048fc324538e32d51
Merge: d69e782032 bcd57103a2
Author: Brandon Kelly <[email protected]>
Date:   Wed Mar 8 09:35:08 2023 -0800

    Merge pull request #12831 from craftcms/bugfix/12829-selectize-light-class-colour

    adjust highlighted selectize option colour for .light class

commit bcd57103a25685fee43f7fc211e245a02066fa07
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 09:34:30 2023 -0800

    Release note

    [ci skip]

commit 432f2182bc44e1549d9fc0419706b1fd24be9a20
Merge: 50ed028fbb 33380d2db3
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 09:22:39 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map
    #	src/web/assets/cp/src/js/BaseElementSelectorModal.js

commit 33380d2db30afda34a917fe9a58dd2d5d25a7617
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 09:19:15 2023 -0800

    Fixed #12802 part 2

commit 50ed028fbb73ba3fe303cae565384fe92baeda5f
Merge: 054ed5859f 6d79a9df5f
Author: Brandon Kelly <[email protected]>
Date:   Wed Mar 8 08:58:38 2023 -0800

    Merge pull request #12832 from craftcms/bugfix/transform-dimensions

    Make sure dimensions are normalized

commit 6d79a9df5f46978f5685d01880a4e3587e571e92
Author: Brian Hanson <[email protected]>
Date:   Wed Mar 8 09:26:58 2023 -0600

    Make sure dimensions are normalized

    While messing around I noticed that the new letterbox transform mode
    didn't work when one of the dimensions wasn't provided. This updates it
    to calculate missing dimensions with the `normalizeDimensions` method
    used by other transform modes.

commit 7e969803dd5ac9a0496b5999356b972b623577b3
Author: Iwona Just <[email protected]>
Date:   Wed Mar 8 14:21:12 2023 +0000

    adjust highlighted selectize option colour for .light class

commit 054ed5859feb821b9e472fd4504ecac3dfa4e2fd
Author: brandonkelly <[email protected]>
Date:   Wed Mar 8 05:35:01 2023 -0800

    Changelog tweaks

    [ci skip]

commit e89468520ce8911a050f29e1d3266e8c3195b9ea
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 18:54:08 2023 -0800

    Finish 4.4.0-beta.7

commit 37ce17c9e492fb677f412d42871424f4f714f4c9
Merge: c6e12759b3 2917cd6a0b
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 18:52:57 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/config/app.php

commit 2917cd6a0b32d72fa2d4c5ce0ad29e9c38361266
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 18:52:11 2023 -0800

    Finish 3.8.0-beta.6

commit c6e12759b338cec87283fd9006959ac874d81d9c
Merge: 3177adf636 5f3fd3df82
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 18:44:22 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/config/app.php
    #	src/web/assets/garnish/dist/garnish.js
    #	src/web/assets/garnish/dist/garnish.js.map

commit 5f3fd3df829a9ac3d92511cdbf30b6a6979aa99f
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 18:42:26 2023 -0800

    Fixed #12801

commit 3177adf636b43da8d5d8f5b072c5a0ca53f6d6b3
Merge: 1580c2efcf d69e782032
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 17:48:32 2023 -0800

    Merge branch 'develop' into 4.4

commit d69e782032e19c52a8c3f2db45ed1012f4e1c7a8
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 17:48:07 2023 -0800

    Fix `npm run dev`

    [ci skip]

commit 1580c2efcfb0237d8488b07685aeb45d743d0a6a
Merge: edb4279c8f 2c347e18b5
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 15:27:32 2023 -0800

    Merge branch 'develop' into 4.4

commit 34d57fdadcc358854a0726bd7bd0db870a039e3e
Merge: d619527239 6ed80b2295
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 13:13:08 2023 -0800

    Merge branch 'hotfix/changelog-typo' into main

commit 2c347e18b58cba7de4eefa53b0235f0b0c756432
Merge: 4624ce802b 34d57fdadc
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 13:13:08 2023 -0800

    Merge branch 'main' into develop

commit 6ed80b229521f99d8e89299a0ebf6bf185449b4f
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 13:13:00 2023 -0800

    Removed backticks

commit edb4279c8fd0122cf9eedd25d9b453b111c80a92
Merge: b14ff21b21 4624ce802b
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 13:08:35 2023 -0800

    Merge branch 'develop' into 4.4

    # Conflicts:
    #	src/config/app.php

commit d619527239b83f1802bfe60e36cc5cffb1700fc3
Merge: af40a2d6e0 bd93e5faac
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 13:06:28 2023 -0800

    Merge branch 'release/4.3.11' into main

commit 4624ce802b945681797a5b7a302fc823259c98fd
Merge: 75513f6f31 d619527239
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 13:06:28 2023 -0800

    Merge tag '4.3.11' into develop

    4.3.11

    # gpg: Signature made Tue Mar  7 13:06:28 2023 PST
    # gpg:                using RSA key B6C810CBE206E036FB68F3CD5E86D0CED64C7093
    # gpg: Good signature from "Brandon Kelly <[email protected]>" [ultimate]

commit bd93e5faac73bec4ca0caafe424edeb20f5164da
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 13:06:10 2023 -0800

    Finish 4.3.11

commit 75513f6f3122f6007072d73f5628e059c6517e4d
Merge: b1e90f1c9c 11fff0a77e
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 13:04:41 2023 -0800

    Merge branch 'v3' of https://github.com/craftcms/cms into develop

    # Conflicts:
    #	composer.json
    #	src/config/app.php

commit 901ba575bffb825a65a90a393d6f5daa33b44d04
Merge: 730877aead 11fff0a77e
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 13:03:28 2023 -0800

    Merge branch 'v3' into 3.8

    # Conflicts:
    #	composer.json
    #	src/config/app.php
    #	src/web/assets/garnish/dist/garnish.js
    #	src/web/assets/garnish/dist/garnish.js.map

commit 11fff0a77e33141981c5d01fa2fedc9c5588445c
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 13:00:01 2023 -0800

    Finish 3.7.68

commit b1e90f1c9c2a3def5984a25f3122938c342dc77c
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 12:57:39 2023 -0800

    Fixed #12822

commit b14ff21b21968dc0c43ef44a750f85133f603504
Merge: 419c8e189a b6d1a0e1e7
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 12:37:55 2023 -0800

    Merge branch 'develop' into 4.4

commit b6d1a0e1e78b3eccdec4385bc15baaf8562dcbd6
Merge: d220fa1891 3a33c16990
Author: Brandon Kelly <[email protected]>
Date:   Tue Mar 7 12:32:03 2023 -0800

    Merge pull request #12818 from craftcms/t9n/develop

    New Crowdin updates

commit d220fa18910a766fcbd37bd9318f89f4f5ff44c4
Merge: ca7aa001ac 81f7843801
Author: Brandon Kelly <[email protected]>
Date:   Tue Mar 7 12:31:38 2023 -0800

    Merge pull request #12817 from bencroker/patch-48

    Add missing `@since` comment

commit 419c8e189a8faf2c50f2a29a2ec4a53298cec7be
Merge: 211c8b2ee8 ca7aa001ac
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 12:26:23 2023 -0800

    Merge branch 'develop' into 4.4

    # Conflicts:
    #	src/web/assets/garnish/dist/garnish.js
    #	src/web/assets/garnish/dist/garnish.js.map

commit ca7aa001aca9887f2bf0a91e0ad01ff12b896cad
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 12:18:51 2023 -0800

    Fixed #12815

commit fb205be7c38ad5e44752acbb09576c54ad3be41d
Merge: e41aaf5aa5 8c2658c31e
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 12:09:16 2023 -0800

    Merge branch 'v3' of https://github.com/craftcms/cms into develop

    # Conflicts:
    #	CHANGELOG.md
    #	src/web/assets/garnish/dist/garnish.js
    #	src/web/assets/garnish/dist/garnish.js.map

commit 8c2658c31ed638926ee7ccffaae89e257414b45c
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 12:01:07 2023 -0800

    Release note

    [ci skip]

commit f3763f0a395baf6a217d84694af1de4a196fa32d
Merge: dd574e7575 c201634c98
Author: Brandon Kelly <[email protected]>
Date:   Tue Mar 7 12:01:22 2023 -0800

    Merge pull request #12814 from craftcms/feature/dev-408-user-cant-exit-copy-reference-tag-modal

    ESC to close for Copy Reference Tag and Copy to Clipboard modals

commit c201634c989b257ffaec7fc834bca2da620084ad
Author: Lupe <[email protected]>
Date:   Mon Mar 6 11:34:06 2023 -0800

    Add removeLayerAtIndex function to ui layer manager

    # Conflicts:
    #	src/web/assets/garnish/dist/garnish.js
    #	src/web/assets/garnish/dist/garnish.js.map

commit 844000855a7c5a750cbddda45af315ea8aab92a6
Author: Lupe <[email protected]>
Date:   Fri Mar 3 13:51:05 2023 -0800

    Update CustomSelect with parameter to remove specific layer

    # Conflicts:
    #	src/web/assets/garnish/dist/garnish.js
    #	src/web/assets/garnish/dist/garnish.js.map

commit 211c8b2ee8f090b7f3b09ac10c116cce09f59334
Author: brandonkelly <[email protected]>
Date:   Tue Mar 7 11:40:57 2023 -0800

    Fixed section/entry type/category group/tag group deletion with Postgres

commit 3a33c1699033b6238fca703e8c43aac430eaa2d6
Author: shinybrad <[email protected]>
Date:   Tue Mar 7 10:20:19 2023 -0500

    New translations app.php (Norwegian Bokmal)
    [ci skip]

commit 81f7843801dc31f04d0752cb4432c878ff11db20
Author: Ben Croker <[email protected]>
Date:   Tue Mar 7 09:12:40 2023 -0600

    Add commas

commit a68145da5d3f5bde5d5ee510fb6f0325ab7a4868
Author: Ben Croker <[email protected]>
Date:   Tue Mar 7 09:07:53 2023 -0600

    Add missing `@since` comment

commit fe9351ed80308614e7a405360c8b19f68a7ba6ad
Merge: 44ce69fabd cc18616ff0
Author: Brandon Kelly <[email protected]>
Date:   Mon Mar 6 22:56:16 2023 -0800

    Merge pull request #12811 from craftcms/bugfix/12791-asset-indexing-delete-empty-dirs

    Bugfix/12791 asset indexing delete empty dirs

commit cc18616ff0b5d943b2226bdd1fd1fa9b37667ea2
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 22:55:57 2023 -0800

    Release note

    [ci skip]

commit 29f14534aed8fea3cb7c31190d1428586c007d6d
Merge: e14e2ecb44 44ce69fabd
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 22:54:38 2023 -0800

    Merge branch '4.4' into bugfix/12791-asset-indexing-delete-empty-dirs

commit 44ce69fabd8bfded7152c728d726da088661a1c5
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 22:52:39 2023 -0800

    Typo

    [ci skip]

commit 03817077d1d3717012616f859fb6c845eeb1e246
Merge: 6156c296bb 730877aead
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 22:52:26 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map

commit 730877aead366990045d79f5c5cb5728bb2c8980
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 22:50:54 2023 -0800

    Fixed #12810

commit 6156c296bb4d07a9d3a426cae0f451fe759e2903
Merge: a429f8d64f 7dc71f8121
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 22:31:57 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG-WIP.md
    #	CHANGELOG.md
    #	src/elements/Asset.php
    #	src/helpers/Assets.php
    #	src/services/Assets.php
    #	src/translations/ru/app.php
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

    [ci skip]

commit 7dc71f81216d42432632f442fdec04fd1e5387ea
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 22:30:41 2023 -0800

    Backport 4d5c5e44a8cee528ab279988722aa9540c1d393b

     Fixes #12808

commit a429f8d64f783012fcbd76605095293e70c59667
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 22:25:56 2023 -0800

    Cleanup

    [ci skip]

commit e229c548ee3b9dcac6401a4405c734ab1a53b139
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 22:15:26 2023 -0800

    Fixed #12807

    [ci skip]

commit 091ef4b76a5de61ab52fb94a0482fc84afa8d33b
Merge: b91c19896d 9b793711ee
Author: Brandon Kelly <[email protected]>
Date:   Mon Mar 6 21:48:15 2023 -0800

    Merge pull request #12806 from craftcms/t9n/4.4

    New Crowdin updates

commit c754da2d34dea9ddcd6e3cfe069751348a7415f3
Merge: 776e3c92e7 893b7d3157
Author: Brandon Kelly <[email protected]>
Date:   Mon Mar 6 21:47:48 2023 -0800

    Merge pull request #12804 from craftcms/t9n/3.8

    New Crowdin updates

commit b91c19896d22b0d3407d74fd84f80cb67971c167
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 21:42:50 2023 -0800

    Fixed #12802

commit b476608bf4d7bc73de22ce8bdfab453f50865ef9
Merge: db7488ac8f e41aaf5aa5
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 21:39:48 2023 -0800

    Merge branch 'develop' into 4.4

    # Conflicts:
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit e41aaf5aa54b7393795e3cb168a7ff1b0b320823
Merge: 983c00d2d4 dd574e7575
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 21:37:51 2023 -0800

    Merge branch 'v3' of https://github.com/craftcms/cms into develop

    # Conflicts:
    #	CHANGELOG.md
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit 776e3c92e772b61601307f27b7418878d2b487fa
Merge: a5c481ea65 dd574e7575
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 21:35:09 2023 -0800

    Merge branch 'v3' into 3.8

    # Conflicts:
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit dd574e75759e5535c3e8d10b496e4f33b58d5c7e
Author: brandonkelly <[email protected]>
Date:   Mon Mar 6 21:34:12 2023 -0800

    Fixed a link hover bug

commit e14e2ecb44f4890477f2841e461452a7b1e1cd09
Author: Iwona Just <[email protected]>
Date:   Mon Mar 6 14:38:57 2023 +0000

    when deleting folders, delete empty dir if list empty folders is true

commit 4a0ff86b48aa6873bb07b85fccb8b5cfb9c8484d
Author: Iwona Just <[email protected]>
Date:   Mon Mar 6 14:37:55 2023 +0000

    when checking if folder is empty account for deleted assets with kept files

commit 9b793711ee5ca5e17775133aa2cfb892e351bc80
Author: shinybrad <[email protected]>
Date:   Mon Mar 6 07:32:31 2023 -0500

    New translations app.php (Swedish)
    [ci skip]

commit 051128604928ebb3dd1ac0e386086b912826421c
Author: shinybrad <[email protected]>
Date:   Mon Mar 6 07:32:29 2023 -0500

    New translations app.php (Russian)
    [ci skip]

commit 893b7d3157942718a50d54d9dc7e37becdb96a3d
Author: shinybrad <[email protected]>
Date:   Mon Mar 6 07:32:23 2023 -0500

    New translations app.php (Russian)
    [ci skip]

commit 71dc299ec34e19a5c29a1e447ea7262a6bc5da12
Author: shinybrad <[email protected]>
Date:   Mon Mar 6 06:26:31 2023 -0500

    New translations app.php (Swedish)
    [ci skip]

commit db7488ac8f47223b48c470d222772a5f2c9ba3ab
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 07:18:16 2023 -0800

    Finish 4.4.0-beta.6

commit 754c385492b716eac3f26fe597ad32f782c5fee4
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 07:17:26 2023 -0800

    Fixed ?? support + preloadSingles

    https://github.com/craftcms/cms/pull/12787#issuecomment-1455105290

commit 8076770fec35d7da02a57089f55f1217fcd9701d
Merge: 174083b4de a5c481ea65
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 07:08:33 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/config/app.php

commit a5c481ea65593ce855d342dbe6511cc73f101769
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 07:07:06 2023 -0800

    Finish 3.8.0-beta.5

commit 407293689e6a867d090ab326074cfa1bdaf654c6
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 07:06:25 2023 -0800

    Fixed #12768

commit 174083b4de4a9e42f19a3dd2894fb6fd441b4c19
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 05:22:38 2023 -0800

    Finish 4.4.0-beta.5

commit 5c2f450cee0b2b042b44157754f8e8b3136a9ec4
Merge: e8fd266de2 ba43de0f89
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 05:20:58 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/config/app.php

commit ba43de0f8970762500c629e42db23045026eeedf
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 05:17:58 2023 -0800

    Finish 3.8.0-beta.4

commit f2a6e9e5fecf1c0ac885c792780ffc6595d6214d
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 05:07:25 2023 -0800

    Add beta release notes for #12768

    [ci skip]

commit e8fd266de2f9a17c470d0ff9d242de42ecb64069
Merge: bb3e1aec31 074f558bf4
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 05:06:18 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map

commit bb3e1aec310876e031daff3208058c0828d44ed9
Merge: 9e58f91280 fb2f4550ab
Author: Brandon Kelly <[email protected]>
Date:   Sun Mar 5 05:03:42 2023 -0800

    Merge pull request #12794 from craftcms/t9n/4.4

    New Crowdin updates

commit 074f558bf47b495bc32985b21cb6fea3fcbd4e97
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 05:00:06 2023 -0800

    Factor permissions into dragging

commit 9e58f91280736184c56eb81c130f68fc85f4eebe
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 04:45:52 2023 -0800

    No special border color for dragged table rows

commit 0359fb00cf5d92a9ed9463946632520a04c787b2
Merge: 012d69a266 ccc1b46838
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 04:40:40 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map
    #	src/web/assets/cp/src/css/_cp.scss
    #	src/web/assets/cp/src/css/_main.scss
    #	src/web/assets/garnish/dist/garnish.js
    #	src/web/assets/garnish/dist/garnish.js.map

commit ccc1b46838e6ef0d75362399e390ba68f918a98c
Author: brandonkelly <[email protected]>
Date:   Sun Mar 5 04:15:02 2023 -0800

    Better way of doing the offset drag helpers

    Use negative margin + padding on a container element to make the helper appear to be offset from the cursor, while still technically directly below it, so we avoid all the hover style issues and unintended click events for quick drags

commit fb2f4550abf2f058fbecad711e0d34bb9a578e7b
Author: shinybrad <[email protected]>
Date:   Sun Mar 5 06:51:33 2023 -0500

    New translations app.php (Portuguese)
    [ci skip]

commit 012d69a2669606933e97c482ef464531c921bd05
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 23:11:47 2023 -0800

    Improved the checkered BG for dark backgrounds

commit 3bda46e4a283fb21f220113f6ffe2753b7ff740a
Merge: f6df9b1f85 2845cc05cb
Author: Brandon Kelly <[email protected]>
Date:   Sat Mar 4 23:07:15 2023 -0800

    Merge pull request #12793 from craftcms/feature/secondary-action-btns

    Improve element action button styling

commit 2845cc05cbbe15e8ea9b774385f400181c70e597
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 23:06:40 2023 -0800

    Release note

    [ci skip]

commit ea1166e350ba141df140265b11747b07d1a36173
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 23:02:02 2023 -0800

    Improve element action button styling

commit f6df9b1f85f3eb430bd19ec2a9ecfd8e3c253fe1
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 22:47:59 2023 -0800

    Make all selected elements consistent with selected table rows

commit f366d1c093a16f8f463b4ecd5ca6b814fdbbb947
Merge: 7912c0114c cd746d8c92
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 22:22:14 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/models/VolumeFolder.php
    #	src/translations/ko/app.php
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map
    #	src/web/assets/cp/src/css/_cp.scss
    #	src/web/assets/cp/src/css/_fld.scss
    #	src/web/assets/cp/src/css/_main.scss
    #	src/web/assets/garnish/dist/garnish.js
    #	src/web/assets/garnish/dist/garnish.js.map

commit cd746d8c92b4149386aaca708ff6748012691ab7
Merge: 082fcb5734 46b4756efd
Author: Brandon Kelly <[email protected]>
Date:   Sat Mar 4 20:23:09 2023 -0800

    Merge pull request #12792 from craftcms/feature/asset-drag

    Reintroduce asset/folder dragging

commit 46b4756efdd39142ff34bc5f823d02735b99a8b6
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 20:22:42 2023 -0800

    Release notes

    [ci skip]

commit a6eeabfca395517047e0aaece0a94edfaf381450
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 19:53:22 2023 -0800

    Reintroduce asset/folder dragging

commit 7912c0114c439be4fbc0319143a3f35d32cc42d6
Merge: 35b055c0b2 0549055dcd
Author: Brandon Kelly <[email protected]>
Date:   Sat Mar 4 07:07:15 2023 -0800

    Merge pull request #12787 from craftcms/feature/preload-singles

    Feature/preload singles

commit 0549055dcda5e283badc73b7c42d20780a6b8033
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 07:05:25 2023 -0800

    Update the changelog

    [ci skip]

commit 80747f1db4fd4a5a86b6489838949311b6407b4f
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 07:02:20 2023 -0800

    Not needed anymore

commit 4b33255346cc4442ab91b97aa8fdbd2c06a64cfb
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 06:56:37 2023 -0800

    preloadSingles config setting

commit 35b055c0b2576bfd8c68e8adf08e2e023701ebee
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 06:37:45 2023 -0800

    Fixed asset permission checks

    Fixes #12790

commit ece1393bd048153b348c1b89f9a53522ff6b4986
Merge: 8f9dd4d2d0 3d755d2193
Author: Brandon Kelly <[email protected]>
Date:   Sat Mar 4 06:17:55 2023 -0800

    Merge pull request #12789 from craftcms/t9n/4.4

    New Crowdin updates

commit 082fcb5734cedf1cb7dfffa06b0fdb521ef1663f
Merge: 96001d127c 9f71d4d9aa
Author: Brandon Kelly <[email protected]>
Date:   Sat Mar 4 06:15:54 2023 -0800

    Merge pull request #12788 from craftcms/t9n/3.8

    New Crowdin updates

commit 3d755d21934d0e35fb929cd9c23b3eee7299640f
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:19 2023 -0500

    New translations app.php (German, Switzerland)
    [ci skip]

commit a06701aeb476bb77c70ac70ecebb7371c429d97e
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:17 2023 -0500

    New translations app.php (Norwegian Bokmal)
    [ci skip]

commit 0637230baf8264dff65c4e8b1e6d7dc36d0f6a2d
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:16 2023 -0500

    New translations app.php (French, Canada)
    [ci skip]

commit 1812cb9cd69c60c5e02323ac8ebe2ee0eeed4b45
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:15 2023 -0500

    New translations app.php (English, United Kingdom)
    [ci skip]

commit 3ae0b12905bc94f853e56d4c81b5de084a6342bf
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:13 2023 -0500

    New translations app.php (Thai)
    [ci skip]

commit 5f8a8fef625f170dd4a6fe256fc68050595cdb4c
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:12 2023 -0500

    New translations app.php (Persian)
    [ci skip]

commit c6bade2212ffbb22b86fb75953dda41ee95ab071
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:11 2023 -0500

    New translations app.php (Chinese Simplified)
    [ci skip]

commit 7c2c2eae5abc659ff2aa487249e72cf709cc29af
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:10 2023 -0500

    New translations app.php (Ukrainian)
    [ci skip]

commit d4fec45265b43c6821180ab5010043200ea9301d
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:08 2023 -0500

    New translations app.php (Turkish)
    [ci skip]

commit 22b094ac6fbfaa59edfe0770332d4b8a701c7559
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:07 2023 -0500

    New translations app.php (Swedish)
    [ci skip]

commit ada935b41678e2dfcc634719ec26537ba3637ff3
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:06 2023 -0500

    New translations app.php (Slovak)
    [ci skip]

commit 13344b90353746ccca0a8e29cab3bd711c710a32
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:04 2023 -0500

    New translations app.php (Russian)
    [ci skip]

commit 62041b7479520eec032c27f87824e765492fd4da
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:03 2023 -0500

    New translations app.php (Portuguese)
    [ci skip]

commit 881c2ad6c98db9be9e1006dc815178564ad33ff7
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:02 2023 -0500

    New translations app.php (Polish)
    [ci skip]

commit ba689ff299e5ba28f450e31eb28cb10db8a940b8
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:59:00 2023 -0500

    New translations app.php (Dutch)
    [ci skip]

commit bba6fb55e63f1e56e8c6587d8e009560a26d483e
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:59 2023 -0500

    New translations app.php (Korean)
    [ci skip]

commit 68d45540b7f71a41674ff0717df799b6c865eb27
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:58 2023 -0500

    New translations app.php (Japanese)
    [ci skip]

commit b69a0f6b3d1651bea0ead4e4eb71c756cd4411f0
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:57 2023 -0500

    New translations app.php (Italian)
    [ci skip]

commit 954721dc3c0d612f9aa51ebb0042bcaf4a062154
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:55 2023 -0500

    New translations app.php (Hungarian)
    [ci skip]

commit d4fa89286d3adacf06e97d26503d2394fabc6461
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:54 2023 -0500

    New translations app.php (Hebrew)
    [ci skip]

commit 3e4531b7015e67ffe9b6f9d498b287b437224a76
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:53 2023 -0500

    New translations app.php (German)
    [ci skip]

commit 1fb2afdabf09b8b76a39fd5f863e62383224ddf3
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:52 2023 -0500

    New translations app.php (Danish)
    [ci skip]

commit 66581d6f847206d047e35b50e0a3ec2a30fac5fe
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:50 2023 -0500

    New translations app.php (Czech)
    [ci skip]

commit 6640ad8e334ee0a05d7f9edca9d2d3fe91a3b941
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:49 2023 -0500

    New translations app.php (Arabic)
    [ci skip]

commit 793d3397d3f79882e9d79206dbd460248eea37fe
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:48 2023 -0500

    New translations app.php (Spanish)
    [ci skip]

commit aa04982cc9306d808371bb5178d98be316de8bfe
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 08:58:46 2023 -0500

    New translations app.php (French)
    [ci skip]

commit 8f9dd4d2d09486350811dba9b457c8aebb018eed
Merge: ba372e2b14 96001d127c
Author: brandonkelly <[email protected]>
Date:   Sat Mar 4 05:36:49 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG-WIP.md
    #	src/base/ApplicationTrait.php
    #	src/config/app.php
    #	src/helpers/Api.php
    #	src/helpers/Cp.php
    #	src/services/Plugins.php
    #	src/templates/_layouts/components/alerts.twig
    #	src/translations/ar/app.php
    #	src/translations/de/app.php
    #	src/translations/fr-CA/app.php
    #	src/translations/sk/app.php
    #	src/translations/uk/app.php
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map
    #	src/web/assets/cp/src/css/_cp.scss

commit 4860997d10af940d85edd9c7b292c32d9557e1e2
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 01:10:05 2023 -0500

    New translations app.php (Korean)
    [ci skip]

commit 318217ccc82c57c9261d4d602ef9f7f458f6548f
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 00:13:12 2023 -0500

    New translations app.php (Korean)
    [ci skip]

commit 9f71d4d9aacd5f8b8ee65eaee8cc01d7211a1189
Author: shinybrad <[email protected]>
Date:   Sat Mar 4 00:13:08 2023 -0500

    New translations app.php (Korean)
    [ci skip]

commit 2224aca048f7fdd81489ec89e39fba9181af9d23
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:08:16 2023 -0500

    New translations app.php (German, Switzerland)
    [ci skip]

commit 33c4c0db4ffbc2c6fa1cd0810b08a89d4f25ab35
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:08:11 2023 -0500

    New translations app.php (Persian)
    [ci skip]

commit 0c094069dc4a702932b3f2f064254941b481000a
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:08:06 2023 -0500

    New translations app.php (Slovak)
    [ci skip]

commit d4ce65fe4a2ee5d8851d49c5bda50544ee8311e0
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:47 2023 -0500

    New translations app.php (German, Switzerland)
    [ci skip]

commit fb94309b3ce61f5d1b1e7b911324d3b379c13cd1
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:46 2023 -0500

    New translations app.php (Norwegian Bokmal)
    [ci skip]

commit cba72c4a2c5afa483bad9e3b5ac53d0a62ecf6b5
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:45 2023 -0500

    New translations app.php (French, Canada)
    [ci skip]

commit feed565f5e17a54c0a7f8f96b58102a26b2e135f
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:44 2023 -0500

    New translations app.php (English, United Kingdom)
    [ci skip]

commit 2da2c3a127271a3cbc46550a308fb9f40d23c018
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:42 2023 -0500

    New translations app.php (Thai)
    [ci skip]

commit 6af0961ce8130e4c2efcaa2b142535675e1b006b
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:41 2023 -0500

    New translations app.php (Persian)
    [ci skip]

commit d2203eef994123f29e71d47f1ecbd2447107acd8
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:40 2023 -0500

    New translations app.php (Chinese Simplified)
    [ci skip]

commit 93c9b9909d7879bc897ab7054d2d386f7e7799d1
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:38 2023 -0500

    New translations app.php (Ukrainian)
    [ci skip]

commit 91dac4b8834b15e8780df2753bbeca73538f4293
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:37 2023 -0500

    New translations app.php (Turkish)
    [ci skip]

commit 955a693591a84c5b5050958449cb43d335d6af6e
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:36 2023 -0500

    New translations app.php (Swedish)
    [ci skip]

commit d9c9b9ef162fd1f892eb49e845ad1975b693af7c
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:35 2023 -0500

    New translations app.php (Slovak)
    [ci skip]

commit ebf2f9dec38753e92b35ca26a3f8036bf51bd05f
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:34 2023 -0500

    New translations app.php (Russian)
    [ci skip]

commit ec89f7dfa12bc1a7d710a7dbc1fdf0cfdfde7066
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:32 2023 -0500

    New translations app.php (Portuguese)
    [ci skip]

commit 76638bd96a16ad42bda81ac8236c874a66934ae6
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:31 2023 -0500

    New translations app.php (Polish)
    [ci skip]

commit b33975d610849ec4552fd86d807788f643e7e4ab
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:30 2023 -0500

    New translations app.php (Dutch)
    [ci skip]

commit 65a38e30e90859e31840065ec43d01e47e45fb82
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:28 2023 -0500

    New translations app.php (Korean)
    [ci skip]

commit d5fd62c405bde2fbbb59250a7f0f68341dcc77c6
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:27 2023 -0500

    New translations app.php (Japanese)
    [ci skip]

commit 8eb544d2b01c34aac6e88da1064a6e240318e9e1
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:26 2023 -0500

    New translations app.php (Italian)
    [ci skip]

commit cd7861f2797b6b03e310efecbc0eec5b9fe1c7bb
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:25 2023 -0500

    New translations app.php (Hungarian)
    [ci skip]

commit b585594f533fd1c80a2302076cc7071a36e5ca2b
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:24 2023 -0500

    New translations app.php (Hebrew)
    [ci skip]

commit f06437e2a87dd734628a1748160a74573b4cbb41
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:22 2023 -0500

    New translations app.php (German)
    [ci skip]

commit ff7084e73ec609200fd9998b73ccfd436dd06292
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:21 2023 -0500

    New translations app.php (Danish)
    [ci skip]

commit 55c582551c9bd042fc0999269bda49f50b3ec6d3
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:20 2023 -0500

    New translations app.php (Czech)
    [ci skip]

commit 4a9fad3502101278a631b65e467299f91106d11f
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:19 2023 -0500

    New translations app.php (Arabic)
    [ci skip]

commit 94ea27188d1c9f59bca140e30719fd191204e102
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:17 2023 -0500

    New translations app.php (Spanish)
    [ci skip]

commit c93db3cf40603ac30db93ccb159a4120e02be999
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 20:07:16 2023 -0500

    New translations app.php (French)
    [ci skip]

commit 96001d127c3125257d2df143cbfdce6bce3747f4
Merge: 87661ab63f c25add0174
Author: Brandon Kelly <[email protected]>
Date:   Fri Mar 3 17:01:21 2023 -0800

    Merge pull request #12768 from craftcms/feature/dev-1056-consolidated-licensing-issues-alert

    Consolidated “Licensing Issues” alert

commit c25add01745f610873b1f2d8a03755533ba660b5
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 16:58:08 2023 -0800

    Message typo

commit 7662122542c0d9a89533f626a9b5a5db4c44ce5d
Merge: c72eb1b087 87661ab63f
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 16:52:06 2023 -0800

    Merge branch '3.8' into feature/dev-1056-consolidated-licensing-issues-alert

    # Conflicts:
    #	src/config/app.php
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit 87661ab63f38b27a9b88239c0d3d472196e79698
Merge: b7ee37b134 1f70ca6ec2
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 16:50:31 2023 -0800

    Merge branch 'v3' into 3.8

    # Conflicts:
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map

commit 289852d5671988436ab81d36ca060ec87aa461bb
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 16:44:49 2023 -0800

    Release notes

commit c4de13a2d4d089bb7758a811d32beffafc8d110c
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 15:59:04 2023 -0800

    Preload singles, take 2

commit ba372e2b142d77ec6bb26a91014d830c38f8342d
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 14:21:32 2023 -0800

    Fixed search UI for element selector modals

commit 4e149c25d8617d6d47764f218ff6c906ed30d975
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 14:14:18 2023 -0800

    Fixed Categories/Tags → Entries field conversion

commit 65502a8cf3145ee0ab06e40fd6932c1df45d60c5
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 13:42:58 2023 -0800

    Fixed $searchContainer

    [ci skip]

commit 5c2123d99f943eb600813bc5cd3bc65be5ea8aa9
Merge: ee5704ef54 0975c9149c
Author: Brandon Kelly <[email protected]>
Date:   Fri Mar 3 12:54:36 2023 -0800

    Merge pull request #12784 from craftcms/t9n/4.4

    New Crowdin updates

commit b7ee37b13401c960508feb419cf00e2343f2c90e
Merge: 20e9e26dd5 969c986779
Author: Brandon Kelly <[email protected]>
Date:   Fri Mar 3 12:49:44 2023 -0800

    Merge pull request #12786 from craftcms/t9n/3.8

    New Crowdin updates

commit ee5704ef54ee0f309fe7f9178ecc52db55912827
Merge: acbd3b8eb7 cb3cb8beec
Author: Brandon Kelly <[email protected]>
Date:   Fri Mar 3 12:48:03 2023 -0800

    Merge pull request #12785 from craftcms/feature/dev-440-css-font-icon-for-search-is-not-hidden

    CSS font icon for search is not hidden from screen reader users

commit cb3cb8beeca7df0db9318836b30ce35d6a3594d9
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 12:47:43 2023 -0800

    Release note

    [ci skip]

commit ff128ddf24acdb38d64b933e16275aeae33be0b0
Merge: 54156178cf acbd3b8eb7
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 12:45:43 2023 -0800

    Merge branch '4.4' into feature/dev-440-css-font-icon-for-search-is-not-hidden

commit acbd3b8eb72af2110777043415b1b8f5503ae4b7
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 12:44:40 2023 -0800

    Fix changelog

    [ci skip]

commit e67c1ea5bb2ca02f4fc7635063c69cd2e65b750a
Merge: 5a1ffe5082 983c00d2d4
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 12:43:44 2023 -0800

    Merge branch 'develop' into 4.4

    # Conflicts:
    #	src/translations/zh/app.php
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map

commit 5a1ffe5082cef3fb3e0517a063d2c6a895b68746
Merge: ccf53f1845 f4f6f28904
Author: Brandon Kelly <[email protected]>
Date:   Fri Mar 3 12:19:24 2023 -0800

    Merge pull request #12783 from craftcms/feature/dev-487-when-selecting-a-category-parent-the

    Update modal headings in element select modal to reflect selection label

commit f4f6f28904da7093b3da0f69e0ab85eca41e0de4
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 12:05:40 2023 -0800

    Release note

    [ci skip]

commit c72092728919f681a065d65d2a635f73e95378ce
Merge: ad59082a41 ccf53f1845
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 12:01:26 2023 -0800

    Merge branch '4.4' into feature/dev-487-when-selecting-a-category-parent-the

    # Conflicts:
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map

commit 983c00d2d4f20c21003ffe6ea93d42e574e21310
Merge: 36cdeb21ac 1f70ca6ec2
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 11:24:51 2023 -0800

    Merge branch 'v3' of https://github.com/craftcms/cms into develop

    # Conflicts:
    #	CHANGELOG.md

commit 1f70ca6ec273f1d5159cdd554fb6ff786aaa0fad
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 11:24:11 2023 -0800

    Fixed #12780

commit 0975c9149cb22d17945866c2b6601c55cc6cc5a1
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 14:19:12 2023 -0500

    New translations app.php (French, Canada)
    [ci skip]

commit 969c9867792cbdf66652dbc28b008ae0b5b16272
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 14:19:06 2023 -0500

    New translations app.php (French, Canada)
    [ci skip]

commit 36cdeb21ac826c12551ad9f7c0210782c74f692d
Merge: 850b804de2 dec577a308
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 11:15:53 2023 -0800

    Merge branch 'v3' of https://github.com/craftcms/cms into develop

    # Conflicts:
    #	CHANGELOG.md
    #	src/translations/th/app.php
    #	src/translations/zh/app.php
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map

commit 54156178cf2cd39bd6e4af7f23fc6053859d123f
Author: Lupe <[email protected]>
Date:   Fri Mar 3 10:53:57 2023 -0800

    Build

commit 1ab7dbf6068cbe2c12dd3e98386da64bc36aeec6
Author: Lupe <[email protected]>
Date:   Fri Mar 3 10:52:02 2023 -0800

    Hide search icon in toolbar from screen reader users, and update height of search input to match buttons

commit dec577a30884263f8d79b411e1347615577b43c7
Merge: 3314eb47fd b61594d596
Author: Brandon Kelly <[email protected]>
Date:   Fri Mar 3 10:20:58 2023 -0800

    Merge pull request #12779 from craftcms/bugfix/12769-allow-self-relations

    Bugfix/12769 allow self relations

commit b61594d596db78f938927a972249d09b50d5cd6c
Author: brandonkelly <[email protected]>
Date:   Fri Mar 3 10:20:15 2023 -0800

    Release note

    [ci skip]

commit fecdb5650a98e3e88cb1125f294e440fc9ce6914
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 13:14:52 2023 -0500

    New translations app.php (Italian)
    [ci skip]

commit ad59082a414791c81e6dae83d7eac1e2c36be459
Author: Lupe <[email protected]>
Date:   Fri Mar 3 09:21:39 2023 -0800

    Update BaseElementSelectInput modal to use selection label as h1 text

commit 20e9e26dd573644bd0848be51779287b4c6b8511
Merge: 8078ae7a7c 0497a41c34
Author: Brandon Kelly <[email protected]>
Date:   Fri Mar 3 09:20:28 2023 -0800

    Merge pull request #12781 from craftcms/t9n/3.8

    New Crowdin updates

commit ccf53f1845c896cc1b1e071312d609c12c1ae229
Merge: 74f197599a 3aa536dc19
Author: Brandon Kelly <[email protected]>
Date:   Fri Mar 3 09:19:10 2023 -0800

    Merge pull request #12782 from craftcms/t9n/4.4

    New Crowdin updates

commit ea199233e0858af0761ba4e17b0f9f99c3e9cea4
Author: Lupe <[email protected]>
Date:   Fri Mar 3 09:10:09 2023 -0800

    Update modal title for asset selector modal

commit 3aa536dc194152a1c04e28d15c98f89e1512427b
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 11:41:05 2023 -0500

    New translations app.php (Japanese)
    [ci skip]

commit 2da6ca8b81312740a750c0fa8b8adabfe7b44c37
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:46 2023 -0500

    New translations app.php (Norwegian Bokmal)
    [ci skip]

commit b4c551561b027e36ae786ad4ea603e96c60fecea
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:45 2023 -0500

    New translations app.php (Ukrainian)
    [ci skip]

commit 2d0bf876a7d72b152c2ea9312f955fae4d93680b
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:43 2023 -0500

    New translations app.php (German)
    [ci skip]

commit 266c2e3d31a90b4a5bd434d3807f546c588273e8
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:42 2023 -0500

    New translations app.php (Czech)
    [ci skip]

commit efb14751ddaf420d637cbe2f010e334d78341b99
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:41 2023 -0500

    New translations app.php (Arabic)
    [ci skip]

commit 0497a41c34daa663b9625c5346af84fbe7b4170e
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:35 2023 -0500

    New translations app.php (German, Switzerland)
    [ci skip]

commit e85a69ecb9ae508eaec8b87a356ea0764f90e0c1
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:34 2023 -0500

    New translations app.php (Persian)
    [ci skip]

commit 4c25e4a1b5e8eae750df418c49767d5dd0a76452
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:32 2023 -0500

    New translations app.php (Ukrainian)
    [ci skip]

commit c924a46ff502482ce966fdaa5111bae230ae1b2b
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:31 2023 -0500

    New translations app.php (Slovak)
    [ci skip]

commit 70b6bd9042edfdfb11abc92b93199ff9f8b33c29
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:29 2023 -0500

    New translations app.php (German)
    [ci skip]

commit 16cb74520e0dbc52a99feab865f2a8e9e3ed16f7
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 09:30:28 2023 -0500

    New translations app.php (Arabic)
    [ci skip]

commit 7389391ca40a1858d3adea4ce3af0b6c68a0abb4
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 08:11:33 2023 -0500

    New translations app.php (Dutch)
    [ci skip]

commit 3e59f76ab106cdf30eea6b1ea6b57e24dd3971bf
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 08:11:32 2023 -0500

    New translations app.php (Czech)
    [ci skip]

commit 5ca6e6568e08ca20a7471d03b0bca3036fc5e075
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 08:11:30 2023 -0500

    New translations app.php (Spanish)
    [ci skip]

commit 61b2f257f5fb2d35a58fe64053c4dc3192c196e1
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 08:11:29 2023 -0500

    New translations app.php (French)
    [ci skip]

commit 01e0a5f726e81f5c92bb85c1e1f53d5533ea151c
Author: shinybrad <[email protected]>
Date:   Fri Mar 3 08:11:22 2023 -0500

    New translations app.php (Spanish)
    [ci skip]

commit e44fcbb939cb4e863149bd5c4062e7f6b8dbdeb9
Author: Iwona Just <[email protected]>
Date:   Fri Mar 3 11:49:27 2023 +0000

    prettier and+ forgot compiled assets

commit c527bba8e37c4941a87253c10b6cb451bafd7877
Author: Iwona Just <[email protected]>
Date:   Fri Mar 3 11:42:51 2023 +0000

    factor in allowSelfRelations for tags too

commit f0ea43b767adda796ba960bc6245d00997ee5f24
Author: Iwona Just <[email protected]>
Date:   Fri Mar 3 11:20:10 2023 +0000

    don't lose allow self-relations param for assets and categories

commit 74f197599a6a54e65f1c7e8f4106abf92757b9dc
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 21:25:55 2023 -0800

    Finish 4.4.0-beta.4

commit 452f52bb97d49aee7844db9a57b9ff96b99e66b8
Merge: 77e71bb632 8078ae7a7c
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 21:24:58 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/config/app.php

commit 8078ae7a7c31f121c01becf58b1fc0c37c5eeec9
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 20:34:47 2023 -0800

    Finish 3.8.0-beta.3

commit 27ed07640b6b885785e50376f6693c3dff23d81a
Merge: 7b5d897d85 3314eb47fd
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 20:31:25 2023 -0800

    Merge branch 'v3' into 3.8

    # Conflicts:
    #	src/translations/uk/app.php
    #	src/translations/zh/app.php

commit 77e71bb632e5f49328fa2c1356e0e8f8d28211d2
Merge: cbc598fadb f6411e3b34
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 20:29:34 2023 -0800

    Merge pull request #12773 from craftcms/feature/dev-338-langauge-names-in-own-language-do-not

    Langauge names in own language do not use lang attribute

commit f6411e3b346324213ef797aec970dd41e2aec175
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 20:24:45 2023 -0800

    Release note

commit 03a3368b2eec336e33932d8e0ad9c086517f923d
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 20:20:07 2023 -0800

    Cleanup

commit e9c8855635d21b4a0618ed243715f8a52ca3c0e1
Merge: c4ed721e92 cbc598fadb
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 20:14:57 2023 -0800

    Merge branch '4.4' into feature/dev-338-langauge-names-in-own-language-do-not

commit cbc598fadb6c00c7c4958fb0647c6c0a52a2b46a
Merge: 11fed4eef4 850b804de2
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 20:14:36 2023 -0800

    Merge branch 'develop' into 4.4

commit 850b804de2d8b417c12d8919b8000e8411393fa8
Merge: 7fc90b54ed be5d78e3d0
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 20:04:37 2023 -0800

    Merge pull request #12776 from craftcms/feature/transform-type-error

    Fix `ImageTransformController` type error

commit be5d78e3d01c2bf222c202422193ff3b57b54bd1
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 20:02:51 2023 -0800

    Release note

    [ci skip]

commit aadf53d802226929f01a791e414a5f63c6ca4afd
Author: August Miller <[email protected]>
Date:   Thu Mar 2 16:33:54 2023 -0800

    Prevent error when submitting non-numeric data

commit 11fed4eef42962f0db6feb795d40fe1f1f8118a3
Merge: a4c254a92b 66f267ad53
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 19:53:49 2023 -0800

    Merge pull request #12775 from craftcms/feature/transform-is-defined-checks

    Removes `is defined` checks in Image Transform settings template

commit a4c254a92bf26f779625ed490aba0f2f0485e79f
Merge: 34ad4d929b 87492136b4
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 19:52:33 2023 -0800

    Merge pull request #12774 from craftcms/feature/transform-options

    Remove “Fit” transform “Default Focal Point” option

commit 87492136b468c31e7da99ec5dca1036eb99e38b0
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 19:45:48 2023 -0800

    Release note

    [ci skip]

commit e9e80b9f0781fff039b02b8f859be292b325aca9
Merge: b9e049b8b0 34ad4d929b
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 19:43:08 2023 -0800

    Merge branch '4.4' into feature/transform-options

commit 34ad4d929b6d67cbb234449053d22e8b91601506
Merge: 61ef92085a 743b1ff2e1
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 19:40:07 2023 -0800

    Merge pull request #12772 from craftcms/feature/dev-288-wrap-quick-post-checkboxes-in-fieldset

    Wrap Quick Post checkboxes in fieldset element

commit 743b1ff2e1647bb91982a94b980ac560fcf2c0eb
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 19:32:04 2023 -0800

    Release note

    [ci skip]

commit 748751fc6f92cf68e0eacff720e57f1f3dcae608
Merge: 5d05d60439 61ef92085a
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 19:22:18 2023 -0800

    Merge branch '4.4' into feature/dev-288-wrap-quick-post-checkboxes-in-fieldset

commit 61ef92085a1c3e6facba66297b4efc9a995837c0
Merge: 0e13302441 7b5d897d85
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:57:36 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/translations/ar/app.php
    #	src/translations/cs/app.php
    #	src/translations/da/app.php
    #	src/translations/de-CH/app.php
    #	src/translations/de/app.php
    #	src/translations/en-GB/app.php
    #	src/translations/es/app.php
    #	src/translations/fa/app.php
    #	src/translations/fr-CA/app.php
    #	src/translations/fr/app.php
    #	src/translations/he/app.php
    #	src/translations/hu/app.php
    #	src/translations/it/app.php
    #	src/translations/ja/app.php
    #	src/translations/ko/app.php
    #	src/translations/nb/app.php
    #	src/translations/nl/app.php
    #	src/translations/pl/app.php
    #	src/translations/pt/app.php
    #	src/translations/ru/app.php
    #	src/translations/sk/app.php
    #	src/translations/sv/app.php
    #	src/translations/th/app.php
    #	src/translations/tr/app.php
    #	src/translations/uk/app.php
    #	src/translations/zh/app.php
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit 0e13302441b9fec751f3387fa5ab0f10287080c9
Merge: d3dd0221af 7fc90b54ed
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:55:53 2023 -0800

    Merge branch 'develop' into 4.4

    # Conflicts:
    #	src/translations/pl/app.php
    #	src/translations/uk/app.php
    #	src/translations/zh/app.php

commit 7b5d897d8515c1f5af130d2222cb2d84d414f765
Merge: 6ff21db7dd 79801756ce
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 18:54:36 2023 -0800

    Merge pull request #12766 from craftcms/fix/source-path-display

    Fixes incorrect rendering of source path component

commit 79801756ce57fb80a92df2784b8399d4335cb80a
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:54:13 2023 -0800

    Release note

    [ci skip]

commit 8140677c8c2db4018b24bb1e6c1d8e33d8c77fb4
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:53:09 2023 -0800

    box-sizing for Craft 3

commit 1fa7bf196fbd7722cd602b6aba4e11efe37965ca
Author: Lupe <[email protected]>
Date:   Wed Mar 1 14:44:46 2023 -0800

    Revert to not using CSS variable for chevron width

    # Conflicts:
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit 051c923115dad9e783403b780997b49a0717218d
Author: Lupe <[email protected]>
Date:   Wed Mar 1 14:20:01 2023 -0800

    Build

    # Conflicts:
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit 5567560d4709b369be96c1a7726a85cc3a19d20e
Author: Lupe <[email protected]>
Date:   Wed Mar 1 14:17:14 2023 -0800

    Change chevron width back to rem

commit 99b744fdb12cdcf87e80b9fbef4d08cbb1f59035
Author: Lupe <[email protected]>
Date:   Wed Mar 1 14:11:38 2023 -0800

    Build

    # Conflicts:
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit a8e1e6dd7fa3651e634361993a86142ae3ed0a36
Author: Lupe <[email protected]>
Date:   Wed Mar 1 14:09:04 2023 -0800

    Set bottom instead of top positioning on chevron-left pseudoelement

commit 2ae0d5d646538d2db8808c64ef7c13817e9c7e8e
Author: Lupe <[email protected]>
Date:   Wed Mar 1 14:07:21 2023 -0800

    Add new --chevron-width variable and explicitly set widths on chevron components

    # Conflicts:
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit d3dd0221afa2d28fdd1fad212303e1d8863202c2
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:31:48 2023 -0800

    Revert changes in #12698

commit f8a47d7ba6f66018edfa4734d733030bc9ea7435
Merge: 40089ed3c2 0b6de6ff7e
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 18:21:12 2023 -0800

    Merge pull request #12762 from craftcms/bugfix/12749-event-list-volumes-index-all-volumes-amends

    asset indexing by "all" to account for EVENT_LIST_VOLUMES

commit 0b6de6ff7e7a8d5ddae370b7737fddc2347e4541
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:20:04 2023 -0800

    Release note

    [ci skip]

commit a10d4fea671603b3663ba753f3b3d61b115aef8b
Merge: b5d5a02a6e 969a0b9db5
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:18:13 2023 -0800

    Merge branch '4.4' into bugfix/12749-event-list-volumes-index-all-volumes-amends

commit 40089ed3c2eeccea5e3506ca1eed2c9e1949bc1c
Merge: 969a0b9db5 05379a4287
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 18:16:02 2023 -0800

    Merge pull request #12747 from craftcms/t9n/4.4

    New Crowdin updates

commit 7fc90b54ed469008de60b84502fe4bf16217b1a7
Merge: 466299dab4 56f71eb281
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 18:15:27 2023 -0800

    Merge pull request #12752 from craftcms/t9n/develop

    New Crowdin updates

commit 3314eb47fdac03f1155895f8d48b95da38b284e6
Merge: 6a41aa08d7 bc2329f94a
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 18:14:50 2023 -0800

    Merge pull request #12753 from craftcms/t9n/v3

    New Crowdin updates

commit 6ff21db7ddd97706b4b71711680b5e22f6036b67
Merge: 7fca930846 901621982c
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 18:14:20 2023 -0800

    Merge pull request #12746 from craftcms/t9n/3.8

    New Crowdin updates

commit 466299dab4ee35e9c38630aeec6ad0b2d81e3f90
Merge: 4ad0f1b27a 6a41aa08d7
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:12:05 2023 -0800

    Merge branch 'v3' of https://github.com/craftcms/cms into develop

    # Conflicts:
    #	CHANGELOG.md

commit 7fca9308461af4ccd3b080bbf26051b4fd8e0e2b
Merge: 95701823f1 6a41aa08d7
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:08:25 2023 -0800

    Merge branch 'v3' into 3.8

commit 6a41aa08d7088366cc47aef6a20c2b82c4525d2a
Merge: bd1c661a0c 1015c5fc66
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 18:07:58 2023 -0800

    Merge pull request #12761 from craftcms/bugfix/12760-retain-missing-field-column-on-pc-apply

    don't drop the field column on pc apply if field is missing

commit 1015c5fc66460bed12aff01e815cf266e9bfcb4c
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:06:49 2023 -0800

    Release note

    [ci skip]

commit 4ad0f1b27a883e0b222099135941986afd2586bf
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 18:00:59 2023 -0800

    Reference #12741 too

    [ci skip]

commit f20b25b405ecb1444f2ef6d64ecb1fe08480efd2
Merge: ab1ad5ae40 1871748d35
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 17:58:48 2023 -0800

    Merge pull request #12759 from craftcms/bugfix/12741-filename-strip-soft-hyphens-and-more

    strip soft hyphens and others from filename

commit 1871748d35d5eeff2142b37d93df9d001e88f1f9
Merge: b9e5c12167 ab1ad5ae40
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 17:55:33 2023 -0800

    Merge branch 'develop' into bugfix/12741-filename-strip-soft-hyphens-and-more

    # Conflicts:
    #	CHANGELOG.md

    [ci skip]

commit b9e5c12167a70fe150e5053c9f604b23e7a84214
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 17:55:07 2023 -0800

    Release note

    [ci skip]

commit 969a0b9db505ceb609a61a382d5515f3969164eb
Merge: a4abf47012 8b546724b7
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 17:49:32 2023 -0800

    Merge pull request #12754 from craftcms/feature/dev-407-export-hud-download-button

    Use MultiFunctionBtn for Export button

commit 8b546724b735ee3f55028221a3ba70f2894abf0b
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 17:47:42 2023 -0800

    Release note

    [ci skip]

commit bc24315695415b5144c93b814ba31df9858aa6b2
Merge: 7169ead040 a4abf47012
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 17:44:55 2023 -0800

    Merge branch '4.4' into feature/dev-407-export-hud-download-button

    # Conflicts:
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map

commit a4abf4701253e5e6bfb125feaf139a0f9636f148
Merge: 2564f67e59 03a6b51b01
Author: Brandon Kelly <[email protected]>
Date:   Thu Mar 2 17:42:04 2023 -0800

    Merge pull request #12751 from craftcms/feature/dev-996-user-cant-vertically-scroll-the

    Add overflow-y scroll to condition builder

commit 03a6b51b019d96a2f97abf0919da3cdcc4fabdaf
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 17:41:45 2023 -0800

    Release notes

    [ci skip]

commit 5fe37eb5bc76cee7c4456f5411b45b8deec433d2
Merge: de4eb05c76 2564f67e59
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 17:39:41 2023 -0800

    Merge branch '4.4' into feature/dev-996-user-cant-vertically-scroll-the

    # Conflicts:
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map
    #	src/web/assets/cp/dist/css/cp.css
    #	src/web/assets/cp/dist/css/cp.css.map

commit 2564f67e59ef6dc128046806ef58e89f81642e25
Merge: e598fb5d83 ab1ad5ae40
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 17:37:18 2023 -0800

    Merge branch 'develop' into 4.4

commit ab1ad5ae40d793d206b55c581e4e055ec133029b
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 17:01:09 2023 -0800

    Asset thumbs should *not* ignore `generateTransformsBeforePageLoad`

    Fixes #12750

commit e598fb5d83febdea067270a75143cc0e49dda5dc
Merge: b893491d6d 95701823f1
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 16:41:30 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

commit 95701823f1ce52355506cba87dfbe5dd16e2c743
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 16:41:05 2023 -0800

    Typo

    [ci skip]

commit b893491d6db1e0ebdc1d059ef9c3a49a293d2e0b
Merge: d5aeb9f87a 5b71dca8bd
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 16:40:37 2023 -0800

    Merge branch '3.8' of https://github.com/craftcms/cms into 4.4

    # Conflicts:
    #	CHANGELOG.md
    #	src/web/assets/cp/dist/cp.js
    #	src/web/assets/cp/dist/cp.js.map
    #	src/web/assets/cp/src/js/BaseElementSelectorModal.js

commit 5b71dca8bdbc77ccb40989cbef143d11df71fd31
Author: brandonkelly <[email protected]>
Date:   Thu Mar 2 16:35:06 2023 -0800

    Fixed #12755

commit 66f267ad53bfb029c3999cee25baea82dee88e63
Author: August Miller <[email protected]>
Date:   Thu Mar 2 16:31:30 2023 -0800

    Remove `is defined` checks

    These are unnecessary, as the controller always passes a model to the view.

commit b9e049b8b0cd974cb9b054e4e6efd52ba74673a3
Author: August Miller <[email protected]>
Date:   Thu…
@i-just
started on FE login adjustments
27f1d50
@i-just
alternative mfa without JS
3e66646
@i-just
don't rely on session data only
7e2a429
@i-just
showing errors + tweaks
5dbfc91
@i-just
verification email sent message
b0a0319
@i-just
compiled assets
d1f4e27
@i-just
beginning of the webauthn
29beea6
@i-just
webauthn registration cont.
ca2343f
@i-just
handling errors and statuses
65bfd6c
@i-just
managing security keys
ac96910
@i-just
prep for login via webauthn
6812d53
@i-just
webauthn login hooked up
fbd4bbf
@i-just
tweaks
ae0ed0c
@i-just
user settings for mfa
004a4fa
@i-just
global user settings continued
2e6605b
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
4312590 
# Conflicts:
#	src/web/assets/cp/dist/cp.js
#	src/web/assets/cp/dist/cp.js.map
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
c111382 
# Conflicts:
#	src/web/assets/cp/dist/cp.js
#	src/web/assets/cp/dist/cp.js.map
#	src/web/assets/cp/dist/css/cp.css
#	src/web/assets/cp/dist/css/cp.css.map
@brandonkelly
_accountfields → _profile-fields
abd7fad
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
472716b
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
c8c391d
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
394564e 
# Conflicts:
#	src/translations/en/app.php
#	src/web/assets/cp/dist/cp.js
#	src/web/assets/cp/dist/cp.js.map
#	src/web/assets/cp/dist/css/cp.css
#	src/web/assets/cp/dist/css/cp.css.map
#	src/web/assets/login/dist/css/login.css.map
#	src/web/assets/pluginstore/dist/css/app.css.map
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
065e361
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
88abb03 
# Conflicts:
#	src/web/assets/cp/dist/cp.js
#	src/web/assets/cp/dist/cp.js.map
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
abeffcb
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
8652107
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
bd17df5
@brandonkelly
Merge branch '5.0' into feature/dev-13-mfa-v2
9a42e8e 
# Conflicts:
#	src/web/assets/cp/dist/cp.js
#	src/web/assets/cp/dist/cp.js.map
@brandonkelly
Changed some code
d75367d
@brandonkelly
Drop the Require 2FA setting for now
2153493
@brandonkelly
Fix 'undefined' error
d8c7295
@brandonkelly brandonkelly marked this pull request as ready for review December 7, 2023 00:57
@brandonkelly brandonkelly merged commit 87cf503 into 5.0 Dec 9, 2023
@brandonkelly brandonkelly deleted the feature/dev-13-mfa-v2 branch December 9, 2023 03:38
@brandonkelly brandonkelly mentioned this pull request Jun 8, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brandonkelly brandonkelly brandonkelly requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@i-just @brandonkelly