Skip to content

Commit 8763761

Browse files
authored
Merge branch 'statamic:6.x' into 6.x
2 parents a623274 + 8a48cc5 commit 8763761

32 files changed

Lines changed: 248 additions & 2403 deletions

File tree

.github/workflows/tests.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,16 @@ jobs:
3737
uses: tj-actions/changed-files@v46
3838
with:
3939
files: |
40-
config
41-
lang
42-
resources/users
43-
resources/views
44-
routes
45-
src
46-
tests
40+
config/**
41+
lang/**
42+
resources/users/**
43+
resources/views/**
44+
routes/**
45+
src/**
46+
tests/**
4747
composer.json
4848
phpunit.xml.dist
4949
.github/workflows/tests.yml
50-
tests/Composer/__fixtures__
5150
**.php
5251
5352
- name: Determine whether tests should run

CHANGELOG.md

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

3+
## 6.14.0 (2026-04-16)
4+
5+
### What's new
6+
- Fieldset sections [#14297](https://github.com/statamic/cms/issues/14297) by @jackmcdade
7+
- Collaboration support [#13974](https://github.com/statamic/cms/issues/13974) by @joshuablum
8+
9+
### What's fixed
10+
- Use he-tree i18n prop for tree aria instructions [#14499](https://github.com/statamic/cms/issues/14499) by @jasonvarga
11+
- Rename `Add Block` back to `Add Set` in replicators [#14503](https://github.com/statamic/cms/issues/14503) by @joshuablum
12+
- Resolve Cascade content closure before checking content [#14502](https://github.com/statamic/cms/issues/14502) by @marcorieser
13+
- Fix nocache database driver failing on MySQL with invalid UTF-8 [#14505](https://github.com/statamic/cms/issues/14505) by @jasonvarga
14+
- Fix bard undos [#14506](https://github.com/statamic/cms/issues/14506) by @jackmcdade
15+
- Fix collection listing search case insensitivity [#14486](https://github.com/statamic/cms/issues/14486) by @joshuablum
16+
- Bump follow-redirects from 1.15.11 to 1.16.0 [#14498](https://github.com/statamic/cms/issues/14498) by @dependabot
17+
- Bump dompurify from 3.3.3 to 3.4.0 [#14500](https://github.com/statamic/cms/issues/14500) by @dependabot
18+
19+
20+
321
## 6.13.0 (2026-04-13)
422

523
### What's new

lang/de.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"Add": "Hinzufügen",
3434
"Add a link label": "Linktitel hinzufügen",
3535
"Add Attribute": "Attribut hinzufügen",
36-
"Add Block": "Block hinzufügen",
3736
"Add child link to entry": "Untereintrag hinzufügen",
3837
"Add child nav item": "Unterpunkt hinzufügen",
3938
"Add Color": "Farbe hinzufügen",

lang/de_CH.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"Add": "Hinzufügen",
3434
"Add a link label": "Linktitel hinzufügen",
3535
"Add Attribute": "Attribut hinzufügen",
36-
"Add Block": "Block hinzufügen",
3736
"Add child link to entry": "Untereintrag hinzufügen",
3837
"Add child nav item": "Unterpunkt hinzufügen",
3938
"Add Color": "Farbe hinzufügen",

lang/fr.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"Add": "Ajouter",
3434
"Add a link label": "Ajouter une étiquette de lien",
3535
"Add Attribute": "Ajouter des attributs",
36-
"Add Block": "Ajouter un bloc",
3736
"Add child link to entry": "Ajouter un lien enfant à l'entrée",
3837
"Add child nav item": "Ajouter un élément de navigation enfant",
3938
"Add Color": "Ajouter une couleur",

lang/nl.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"Add": "Toevoegen",
3434
"Add a link label": "Voeg een linklabel toe",
3535
"Add Attribute": "Voeg attribuut toe",
36-
"Add Block": "Voeg blok toe",
3736
"Add child link to entry": "Voeg een child link toe aan entry",
3837
"Add child nav item": "Voeg een child navigatie-item toe",
3938
"Add Color": "Voeg een kleur toe",

lang/ru.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"Add": "Добавить",
3636
"Add a link label": "Добавить название ссылки",
3737
"Add Attribute": "Добавить атрибут",
38-
"Add Block": "Добавить блок",
3938
"Add child link to entry": "Добавить дочернюю ссылку на запись",
4039
"Add child nav item": "Добавить дочерний элемент навигации",
4140
"Add Color": "Добавить цвет",

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"dependencies": {
2222
"@davidenke/marked-text-renderer": "^3.0.0",
2323
"@floating-ui/dom": "^1.6.0",
24-
"@he-tree/vue": "^2.10.0-beta.2",
24+
"@he-tree/vue": "^2.10.5",
2525
"@hoppscotch/vue-toasted": "^0.1.0",
2626
"@inertiajs/vue3": "^2.1.11",
2727
"@internationalized/date": "^3.7.0",
@@ -64,7 +64,7 @@
6464
"cookies-js": "^1.2.2",
6565
"cropperjs": "^1.6.2",
6666
"cva": "^1.0.0-beta.3",
67-
"dompurify": "^3.3.1",
67+
"dompurify": "^3.4.0",
6868
"floating-vue": "^5.2.2",
6969
"fuzzysort": "^3.1.0",
7070
"highlight.js": "^11.7.0",

packages/cms/src/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export const {
1919
requireElevatedSession,
2020
requireElevatedSessionIf,
2121
clone,
22+
debounce,
2223
deepClone,
2324
resetValuesFromResponse,
2425
} = __STATAMIC__.core;

0 commit comments

Comments
 (0)