Merge remote-tracking branch 'origin/6.x' into frontend-elevated-sessions

Author: jasonvarga

.github/workflows/tests.yml

@@ -37,17 +37,16 @@ jobs:
         uses: tj-actions/changed-files@v46
         with:
           files: |
-            config
-            lang
-            resources/users
-            resources/views
-            routes
-            src
-            tests
+            config/**
+            lang/**
+            resources/users/**
+            resources/views/**
+            routes/**
+            src/**
+            tests/**
             composer.json
             phpunit.xml.dist
             .github/workflows/tests.yml
-            tests/Composer/__fixtures__
             **.php
 
       - name: Determine whether tests should run

.npmrc

@@ -0,0 +1,2 @@
+ignore-scripts=true
+min-release-age=3

.storybook/preview.ts

@@ -5,7 +5,7 @@ import {router} from '@inertiajs/vue3';
 import {action} from 'storybook/actions';
 import './storybook.css';
 import './theme.css';
-import {translate} from '@/translations/translator';
+import {translate, translateChoice} from '@/translations/translator';
 import registerUiComponents from '@/bootstrap/ui';
 import DateFormatter from '@/components/DateFormatter';
 import NumberFormatter from '@/components/NumberFormatter';
@@ -25,6 +25,7 @@ router.on('before', (event) => {
 
 setup(async (app) => {
   window.__ = translate;
+  window.__n = translateChoice;
 
   window.Statamic = {
       $config: {
@@ -63,6 +64,7 @@ setup(async (app) => {
   };
 
   app.config.globalProperties.__ = translate;
+  app.config.globalProperties.__n = translateChoice;
   app.config.globalProperties.$date = new DateFormatter;
   app.config.globalProperties.$number = new NumberFormatter;
   app.config.globalProperties.cp_url = (url) => url;

.storybook/storybook.css

@@ -9,6 +9,8 @@
 @custom-variant dark (&:where(.dark, .dark *));
 
 :root {
+    --focus-outline-color: var(--color-blue-400);
+
     /* GROUP VARIABLES -- DECORATION -- COLOURS
     =================================================== */
     --color-code-background: hsl(287deg 80% 93.5%);

CHANGELOG.md

@@ -1,5 +1,46 @@
 # Release Notes
 
+## 6.14.0 (2026-04-16)
+
+### What's new
+- Fieldset sections [#14297](https://github.com/statamic/cms/issues/14297) by @jackmcdade
+- Collaboration support [#13974](https://github.com/statamic/cms/issues/13974) by @joshuablum
+
+### What's fixed
+- Use he-tree i18n prop for tree aria instructions [#14499](https://github.com/statamic/cms/issues/14499) by @jasonvarga
+- Rename `Add Block` back to `Add Set` in replicators [#14503](https://github.com/statamic/cms/issues/14503) by @joshuablum
+- Resolve Cascade content closure before checking content [#14502](https://github.com/statamic/cms/issues/14502) by @marcorieser
+- Fix nocache database driver failing on MySQL with invalid UTF-8 [#14505](https://github.com/statamic/cms/issues/14505) by @jasonvarga
+- Fix bard undos [#14506](https://github.com/statamic/cms/issues/14506) by @jackmcdade
+- Fix collection listing search case insensitivity [#14486](https://github.com/statamic/cms/issues/14486) by @joshuablum
+- Bump follow-redirects from 1.15.11 to 1.16.0 [#14498](https://github.com/statamic/cms/issues/14498) by @dependabot
+- Bump dompurify from 3.3.3 to 3.4.0 [#14500](https://github.com/statamic/cms/issues/14500) by @dependabot
+
+
+
+## 6.13.0 (2026-04-13)
+
+### What's new
+- Frontend Passkeys [#14453](https://github.com/statamic/cms/issues/14453) by @duncanmcclean
+- Allow control over who can be impersonated in UserPolicy [#14469](https://github.com/statamic/cms/issues/14469) by @ryanmitchell
+
+### What's fixed
+- Fix Bard arrow keys/undo [#14467](https://github.com/statamic/cms/issues/14467) by @jackmcdade
+- Fix visible he-tree accessibility text in tree view [#14465](https://github.com/statamic/cms/issues/14465) by @duncanmcclean
+- Append to Bard Entry links [#11468](https://github.com/statamic/cms/issues/11468) by @edalzell
+- Disable broadcast provider when broadcasting driver is null [#14471](https://github.com/statamic/cms/issues/14471) by @jasonvarga
+- Make the collapsible section icon smaller to fit in with the rest of UI [#14478](https://github.com/statamic/cms/issues/14478) by @jaygeorge
+- Add `.npmrc` file [#14477](https://github.com/statamic/cms/issues/14477) by @duncanmcclean
+- Fix SVG sanitization tests [#14483](https://github.com/statamic/cms/issues/14483) by @duncanmcclean
+- Use `cursor: pointer` when selecting from asset grid [#14487](https://github.com/statamic/cms/issues/14487) by @joshuablum
+- Remove negative assertions from `TestCase` [#14458](https://github.com/statamic/cms/issues/14458) by @duncanmcclean
+- Harden OrderBys [#14474](https://github.com/statamic/cms/issues/14474) by @duncanmcclean
+- Harden query value resolution [#14476](https://github.com/statamic/cms/issues/14476) by @duncanmcclean
+- French translations [#14479](https://github.com/statamic/cms/issues/14479) by @ebeauchamps
+- Bump axios from 1.14.0 to 1.15.0 [#14473](https://github.com/statamic/cms/issues/14473) by @dependabot
+
+
+
 ## 6.12.0 (2026-04-08)
 
 ### What's new

composer.json

@@ -27,7 +27,7 @@
         "pixelfear/composer-dist-plugin": "^0.1.4",
         "pragmarx/google2fa": "^8.0 || ^9.0",
         "rebing/graphql-laravel": "^9.15",
-        "rhukster/dom-sanitizer": "^1.0.7",
+        "rhukster/dom-sanitizer": "^1.0.10",
         "spatie/blink": "^1.3",
         "spatie/error-solutions": "^1.0 || ^2.0",
         "statamic/stringy": "^3.1.2",

lang/de.json

@@ -33,7 +33,6 @@
     "Add": "Hinzufügen",
     "Add a link label": "Linktitel hinzufügen",
     "Add Attribute": "Attribut hinzufügen",
-    "Add Block": "Block hinzufügen",
     "Add child link to entry": "Untereintrag hinzufügen",
     "Add child nav item": "Unterpunkt hinzufügen",
     "Add Color": "Farbe hinzufügen",

lang/de_CH.json

@@ -33,7 +33,6 @@
     "Add": "Hinzufügen",
     "Add a link label": "Linktitel hinzufügen",
     "Add Attribute": "Attribut hinzufügen",
-    "Add Block": "Block hinzufügen",
     "Add child link to entry": "Untereintrag hinzufügen",
     "Add child nav item": "Unterpunkt hinzufügen",
     "Add Color": "Farbe hinzufügen",

lang/en/messages.php

@@ -107,6 +107,7 @@
     'fields_visibility_instructions' => 'Control field visibility on publish forms.',
     'fieldset_import_fieldset_instructions' => 'The fieldset to be imported.',
     'fieldset_import_prefix_instructions' => 'Apply a prefix to each field when they are imported. e.g. hero_',
+    'fieldset_import_section_behavior_instructions' => 'Choose whether imported fieldset sections should be preserved or flattened into this section.',
     'fieldset_intro' => 'Fieldsets are an optional companion to blueprints, acting as reusable partials that can be used within blueprints.',
     'fieldset_link_fields_prefix_instructions' => 'Prefix each field in the linked fieldset with this value. Useful for importing the same fields multiple times.',
     'fieldsets_handle_instructions' => 'Used to reference this fieldset elsewhere. This cannot be easily changed later.',

lang/fr.json

@@ -33,7 +33,6 @@
     "Add": "Ajouter",
     "Add a link label": "Ajouter une étiquette de lien",
     "Add Attribute": "Ajouter des attributs",
-    "Add Block": "Ajouter un bloc",
     "Add child link to entry": "Ajouter un lien enfant à l'entrée",
     "Add child nav item": "Ajouter un élément de navigation enfant",
     "Add Color": "Ajouter une couleur",
@@ -80,6 +79,7 @@
     "All caches cleared.": "Tous les caches ont été effacés.",
     "All of the following conditions pass": "Toutes les conditions suivantes sont remplies",
     "All rights reserved.": "Tous droits réservés.",
+    "All Submissions": "Toutes les soumissions",
     "Allow additions": "Autoriser les ajouts",
     "Allow Antlers": "Autoriser Antlers",
     "Allow Any Color": "Autoriser toutes les couleurs",
@@ -488,6 +488,7 @@
     "Expanded format": "Format étendu",
     "Expect a root page": "S'attendre à une page racine",
     "Expired": "Expirée",
+    "Export": "Exporter",
     "Export Submissions": "Exporter les soumissions",
     "Extend Session": "Prolonger la session",
     "Extension": "Extension",
@@ -512,12 +513,14 @@
     "File": "Fichier",
     "File Driver": "Driver de fichier",
     "Filename": "Nom du fichier",
+    "Filtered Submissions": "Soumissions filtrées",
     "Filters": "Filtres",
     "Finish": "Terminer",
     "Finish cropping": "Finir le recadrage",
     "First Child": "Premier enfant",
     "Fix": "Réparer",
     "Fixed": "Fixe",
+    "Flatten": "Aplaties",
     "Flip crop orientation": "Inverser l'orientation du recadrage",
     "Flip Orientation": "Inverser l'orientation",
     "Floating": "Flottante",
@@ -567,6 +570,7 @@
     "Group": "Groupe",
     "Groups": "Groupes",
     "Handle": "Identifiant",
+    "Has Section|Has Sections": "A une section|A des sections",
     "Heading 1": "Titre 1",
     "Heading 2": "Titre 2",
     "Heading 3": "Titre 3",
@@ -598,6 +602,7 @@
     "ID not found": "ID non trouvée",
     "ID regenerated and Stache cleared": "ID regénéré et Stache effacé",
     "If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Si vous ne parvenez pas à cliquer sur le bouton \":actionText\", copiez et collez l'URL ci-dessous dans votre navigateur Web :",
+    "Ignoring Section|Ignoring Sections": "Ignorer la section|Ignorer les sections",
     "Image": "Image",
     "Image Cache": "Cache des images",
     "Image cache cleared.": "Cache des images effacé.",
@@ -643,6 +648,7 @@
     "Item could not be deleted": "L'élément n'a pas pu être supprimé",
     "Item deleted|Items deleted": "Elément supprimé|Eléments supprimés",
     "Items could not be deleted": "Les éléments n'ont pas pu être supprimés",
+    "Keep imported sections as-is.": "Conserver les sections importées telles quelles",
     "Key": "Clé",
     "Key Mappings": "Mappages des touches",
     "Keyed": "A clé",
@@ -718,6 +724,7 @@
     "Maximum items selected:": "Nombre maximal d'éléments sélectionnés :",
     "Maximum Rows": "Nb maxi de rangées",
     "Media": "Médias",
+    "Merge all fields into this section.": "Fusionner tous les champs dans cette section",
     "Merge Cells": "Fusionner des cellules",
     "Min": "Mini",
     "Min Files": "Nb mini de fichiers",
@@ -809,6 +816,7 @@
     "Pages": "Pages",
     "Parser": "Analyseur",
     "Passkey": "Clé d'accès",
+    "Passkey deleted.": "Clé d'accès supprimée.",
     "Passkeys": "Clés d'accès",
     "Password": "Mot de passe",
     "Password changed": "Mot de passe modifié",
@@ -836,6 +844,7 @@
     "Preferences by Role": "Préférences par rôle",
     "Prefix": "Préfixe",
     "Prepend": "Ajouter au début",
+    "Preserve": "Conservées",
     "Press enter to access additional save options": "Appuyez sur Entrée pour accéder à des options de sauvegarde supplémentaires",
     "Preview": "Aperçu",
     "Preview Image": "Image d'aperçu",
@@ -971,6 +980,7 @@
     "Searchable": "Consultable",
     "Searchables": "Consultables",
     "Second": "Seconde",
+    "Section Behavior": "Comportement des sections",
     "Security": "Sécurité",
     "Security update available": "Mise à jour de sécurité disponible",
     "Select": "Choisir",