Skip to content

Commit f5a3e1a

Browse files
authored
Merge branch 'statamic:6.x' into 6.x
2 parents 9c8419a + c6e305e commit f5a3e1a

69 files changed

Lines changed: 2248 additions & 126 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ignore-scripts=true
2+
min-release-age=3

.storybook/main.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ const config: StorybookConfig = {
2525
'@api': resolve(process.cwd(), 'resources/js/api.js'),
2626
};
2727
}
28+
config.build = {
29+
...config.build,
30+
reportCompressedSize: false,
31+
};
2832
return config;
2933
},
3034
};

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
11
# Release Notes
22

3+
## 6.13.0 (2026-04-13)
4+
5+
### What's new
6+
- Frontend Passkeys [#14453](https://github.com/statamic/cms/issues/14453) by @duncanmcclean
7+
- Allow control over who can be impersonated in UserPolicy [#14469](https://github.com/statamic/cms/issues/14469) by @ryanmitchell
8+
9+
### What's fixed
10+
- Fix Bard arrow keys/undo [#14467](https://github.com/statamic/cms/issues/14467) by @jackmcdade
11+
- Fix visible he-tree accessibility text in tree view [#14465](https://github.com/statamic/cms/issues/14465) by @duncanmcclean
12+
- Append to Bard Entry links [#11468](https://github.com/statamic/cms/issues/11468) by @edalzell
13+
- Disable broadcast provider when broadcasting driver is null [#14471](https://github.com/statamic/cms/issues/14471) by @jasonvarga
14+
- Make the collapsible section icon smaller to fit in with the rest of UI [#14478](https://github.com/statamic/cms/issues/14478) by @jaygeorge
15+
- Add `.npmrc` file [#14477](https://github.com/statamic/cms/issues/14477) by @duncanmcclean
16+
- Fix SVG sanitization tests [#14483](https://github.com/statamic/cms/issues/14483) by @duncanmcclean
17+
- Use `cursor: pointer` when selecting from asset grid [#14487](https://github.com/statamic/cms/issues/14487) by @joshuablum
18+
- Remove negative assertions from `TestCase` [#14458](https://github.com/statamic/cms/issues/14458) by @duncanmcclean
19+
- Harden OrderBys [#14474](https://github.com/statamic/cms/issues/14474) by @duncanmcclean
20+
- Harden query value resolution [#14476](https://github.com/statamic/cms/issues/14476) by @duncanmcclean
21+
- French translations [#14479](https://github.com/statamic/cms/issues/14479) by @ebeauchamps
22+
- Bump axios from 1.14.0 to 1.15.0 [#14473](https://github.com/statamic/cms/issues/14473) by @dependabot
23+
24+
25+
326
## 6.12.0 (2026-04-08)
427

528
### What's new

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"pixelfear/composer-dist-plugin": "^0.1.4",
2828
"pragmarx/google2fa": "^8.0 || ^9.0",
2929
"rebing/graphql-laravel": "^9.15",
30-
"rhukster/dom-sanitizer": "^1.0.7",
30+
"rhukster/dom-sanitizer": "^1.0.10",
3131
"spatie/blink": "^1.3",
3232
"spatie/error-solutions": "^1.0 || ^2.0",
3333
"statamic/stringy": "^3.1.2",

lang/en/messages.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@
256256
'theme_share_instructions' => 'Publish this theme through your statamic.com account to make it available to others.',
257257
'try_again_in_seconds' => '{0,1}Try again now.|Try again in :count seconds.',
258258
'try_again_in_minutes' => 'Try again in a minute.|Try again in :count minutes.',
259+
'tree_aria_instructions' => 'Use arrow keys to navigate. Alt plus arrow keys to reorder.',
259260
'two_factor_account_requirement' => 'Your account requires two-factor authentication. Please enable it before proceeding.',
260261
'two_factor_challenge_code_instructions' => 'Enter the 6-digit code from your authenticator app to confirm access to your account.',
261262
'two_factor_enable_introduction' => 'When enabled, you will be prompted for a secure, random token from your phone\'s authenticator app every time you log in.',

lang/fr.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"All caches cleared.": "Tous les caches ont été effacés.",
8181
"All of the following conditions pass": "Toutes les conditions suivantes sont remplies",
8282
"All rights reserved.": "Tous droits réservés.",
83+
"All Submissions": "Toutes les soumissions",
8384
"Allow additions": "Autoriser les ajouts",
8485
"Allow Antlers": "Autoriser Antlers",
8586
"Allow Any Color": "Autoriser toutes les couleurs",
@@ -488,6 +489,7 @@
488489
"Expanded format": "Format étendu",
489490
"Expect a root page": "S'attendre à une page racine",
490491
"Expired": "Expirée",
492+
"Export": "Exporter",
491493
"Export Submissions": "Exporter les soumissions",
492494
"Extend Session": "Prolonger la session",
493495
"Extension": "Extension",
@@ -512,6 +514,7 @@
512514
"File": "Fichier",
513515
"File Driver": "Driver de fichier",
514516
"Filename": "Nom du fichier",
517+
"Filtered Submissions": "Soumissions filtrées",
515518
"Filters": "Filtres",
516519
"Finish": "Terminer",
517520
"Finish cropping": "Finir le recadrage",
@@ -809,6 +812,7 @@
809812
"Pages": "Pages",
810813
"Parser": "Analyseur",
811814
"Passkey": "Clé d'accès",
815+
"Passkey deleted.": "Clé d'accès supprimée.",
812816
"Passkeys": "Clés d'accès",
813817
"Password": "Mot de passe",
814818
"Password changed": "Mot de passe modifié",

lang/fr/messages.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
'form_configure_store_instructions' => 'Désactivez cette option pour ne plus stocker les soumissions. Les évènements et les notifications seront toujours envoyés.',
138138
'form_configure_title_instructions' => 'Habituellement un appel à l’action, comme "Contactez-nous".',
139139
'form_create_description' => 'Commencez par créer votre premier formulaire.',
140+
'form_export_filtered_description' => 'Exportez les soumissions avec les filtres actuels et les colonnes visibles.',
140141
'getting_started_widget_collections' => 'Les collections contiennent les différents types de contenu de votre site.',
141142
'getting_started_widget_docs' => 'Apprenez à connaître Statamic pour bien comprendre ses capacités.',
142143
'getting_started_widget_header' => 'Débuter avec Statamic',
@@ -254,6 +255,7 @@
254255
'taxonomy_next_steps_configure_description' => 'Configurez des noms, associez des collections, définissez des Blueprints et plus encore.',
255256
'taxonomy_next_steps_create_term_description' => 'Créez votre premier terme ou générez une poignée de termes génériques, à vous de voir.',
256257
'theme_share_instructions' => 'Publiez ce thème via votre compte statamic.com pour le rendre accessible aux autres utilisateurs.',
258+
'tree_aria_instructions' => 'Utilisez les flèches directionnelles pour naviguer. Appuyez sur Alt/Option + flèches directionnelles pour réorganiser les touches.',
257259
'try_again_in_minutes' => 'Réessayez dans une minute.|Réessayez dans :count minutes.',
258260
'try_again_in_seconds' => '{0,1} Réessayez maintenant. | Réessayez dans :count secondes.',
259261
'two_factor_account_requirement' => 'Votre compte nécessite une authentification à deux facteurs. Veuillez l’activer avant de continuer.',

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@tiptap/vue-3": "^3.0.0",
5959
"alpinejs": "^3.1.1",
6060
"autosize": "~6.0.1",
61-
"axios": "^1.13.5",
61+
"axios": "^1.15.0",
6262
"clsx": "^2.1.1",
6363
"codemirror": "5.65.12",
6464
"cookies-js": "^1.2.2",

resources/css/components/page-tree.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,7 @@
9393
@apply pt-1 rounded-t-2xl;
9494
}
9595
}
96+
97+
.he-tree-sr-only {
98+
@apply sr-only;
99+
}

0 commit comments

Comments
 (0)