Merge branch '5.x' into field-action-modals

# Conflicts:
#	resources/js/components/field-actions/FieldAction.js

CHANGELOG.md

@@ -1,5 +1,45 @@
 # Release Notes
 
+## 5.38.1 (2024-11-19)
+
+### What's fixed
+- Fix issue when preprocessing dictionary config [#11133](https://github.com/statamic/cms/issues/11133) by @duncanmcclean
+- Prevent unnecessary requests to the Outpost when PHP version is different [#11137](https://github.com/statamic/cms/issues/11137) by @duncanmcclean
+- Fix bard text trimming when CP is on root URL [#11127](https://github.com/statamic/cms/issues/11127) by @jacksleight
+- Hide "Localizable" button in asset blueprints [#11118](https://github.com/statamic/cms/issues/11118) by @duncanmcclean
+- Add upload path traversal tests [#11139](https://github.com/statamic/cms/issues/11139) by @jasonvarga
+- Prevent asset folder path traversal [#11136](https://github.com/statamic/cms/issues/11136) by @jasonvarga
+- More path traversal fixes [#11140](https://github.com/statamic/cms/issues/11140) by @jasonvarga
+- Italian translations [#11145](https://github.com/statamic/cms/issues/11145) by @gioppy
+
+
+
+## 5.38.0 (2024-11-12)
+
+### What's new
+- Extra values for nav field conditions, including depth [#11106](https://github.com/statamic/cms/issues/11106) by @duncanmcclean
+- Make button groups clearable [#11110](https://github.com/statamic/cms/issues/11110) by @caseydwyer
+- Allow transformResults to be called separately from getBaseItems [#11115](https://github.com/statamic/cms/issues/11115) by @ryanmitchell
+- Allow customizing term create label [#11103](https://github.com/statamic/cms/issues/11103) by @daun
+- Accept collections in ampersand list modifier [#11102](https://github.com/statamic/cms/issues/11102) by @daun
+- Add "Container" option to Asset Folders fieldtype [#11099](https://github.com/statamic/cms/issues/11099) by @duncanmcclean
+- Add `fullyQualifiedHandle` method to `Blueprint` [#11096](https://github.com/statamic/cms/issues/11096) by @duncanmcclean
+- Create edit/{id} route for control panel access [#11092](https://github.com/statamic/cms/issues/11092) by @aaronbushnell
+
+### What's fixed
+- Fix wrong blueprint parent after revision publish [#11116](https://github.com/statamic/cms/issues/11116) by @jacksleight
+- Prevent duplicate nocache regions in session [#11109](https://github.com/statamic/cms/issues/11109) by @duncanmcclean
+- Hide "Localizable" button on non-localizable blueprints [#11107](https://github.com/statamic/cms/issues/11107) by @duncanmcclean
+- Fix error after deleting role when storing users in the database [#11069](https://github.com/statamic/cms/issues/11069) by @duncanmcclean
+- Render HTML for dictionary fields in listings [#11088](https://github.com/statamic/cms/issues/11088) by @jasonvarga
+- Use layout config in errors too [#11083](https://github.com/statamic/cms/issues/11083) by @ryanmitchell
+- French translations [#11093](https://github.com/statamic/cms/issues/11093) by @ebeauchamps
+- French translations [#11100](https://github.com/statamic/cms/issues/11100) by @ebeauchamps
+- French translations [#11108](https://github.com/statamic/cms/issues/11108) by @jasonvarga
+- German translations [#11098](https://github.com/statamic/cms/issues/11098) by @helloDanuk
+
+
+
 ## 5.37.0 (2024-11-06)
 
 ### What's new

resources/css/elements/buttons.css

@@ -190,7 +190,7 @@ button {
   ========================================================================== */
 
 .btn-group {
-    @apply flex items-center justify-start p-0;
+    @apply flex items-center justify-start p-0 cursor-auto;
     height: 2.375rem;
 
     button {

resources/js/components/blueprints/Builder.vue

@@ -43,6 +43,7 @@
             :single-tab="!useTabs"
             :initial-tabs="tabs"
             :errors="errors.tabs"
+            :can-define-localizable="canDefineLocalizable"
             @updated="tabsUpdated"
         />
 
@@ -53,10 +54,11 @@
 <script>
 import SuggestsConditionalFields from './SuggestsConditionalFields';
 import Tabs from './Tabs.vue';
+import CanDefineLocalizable from "../fields/CanDefineLocalizable";
 
 export default {
 
-    mixins: [SuggestsConditionalFields],
+    mixins: [SuggestsConditionalFields, CanDefineLocalizable],
 
     components: {
         Tabs,

resources/js/components/blueprints/TabContent.vue

@@ -12,16 +12,20 @@
             :edit-section-text="editSectionText"
             :show-section-handle-field="showSectionHandleField"
             :show-section-hide-field="showSectionHideField"
+            :can-define-localizable="canDefineLocalizable"
             @updated="sectionsUpdated($event)"
         />
     </div>
 </template>
 
 <script>
 import Sections from './Sections.vue';
+import CanDefineLocalizable from "../fields/CanDefineLocalizable";
 
 export default {
 
+    mixins: [CanDefineLocalizable],
+
     components: {
         Sections,
     },

resources/js/components/blueprints/Tabs.vue

@@ -37,6 +37,7 @@
             :new-section-text="newSectionText"
             :edit-section-text="editSectionText"
             :add-section-text="addSectionText"
+            :can-define-localizable="canDefineLocalizable"
             @updated="updateTab(tab._id, $event)"
         />
     </div>
@@ -47,9 +48,12 @@ import {Sortable, Plugins} from '@shopify/draggable';
 import uniqid from 'uniqid';
 import Tab from './Tab.vue';
 import TabContent from './TabContent.vue';
+import CanDefineLocalizable from "../fields/CanDefineLocalizable";
 
 export default {
 
+    mixins: [CanDefineLocalizable],
+
     components: {
         Tab,
         TabContent,

resources/js/components/data-list/HasFilters.js

@@ -47,7 +47,7 @@ export default {
 
         searchPlaceholder() {
             if (this.activePreset) {
-                return __('Searching in: ') + this.activePresetPayload.display;
+                return `${__('Searching in:')} ${this.activePresetPayload.display}`;
             }
 
             return __('Search');

resources/js/components/fieldtypes/AssetFolderFieldtype.vue

@@ -1,13 +1,11 @@
 <template>
     <div class="asset-folder-fieldtype-wrapper">
-        <small class="help-block text-gray-600" v-if="!container">{{ __('Select asset container') }}</small>
-
         <relationship-fieldtype
             v-if="container"
             :handle="handle"
             :value="value"
             :meta="relationshipMeta"
-            :config="{ type: 'asset_folder' }"
+            :config="{ type: 'asset_folder', max_items: this.config.max_items }"
             @input="update"
         />
     </div>
@@ -23,7 +21,7 @@ export default {
     computed: {
 
         container() {
-            return data_get(this.$store.state.publish[this.storeName].values.container, '0', null);
+            return data_get(this.$store.state.publish[this.storeName].values.container, '0', this.config.container);
         },
 
         relationshipMeta() {

resources/js/components/fieldtypes/ButtonGroupFieldtype.vue

@@ -7,7 +7,7 @@
                 ref="button"
                 type="button"
                 :name="name"
-                @click="update($event.target.value)"
+                @click="updateSelectedOption($event.target.value)"
                 :value="option.value"
                 :disabled="isReadOnly"
                 :class="{'active': value === option.value}"
@@ -53,6 +53,10 @@ export default {
 
     methods: {
 
+        updateSelectedOption(newValue) {
+            this.update(this.value == newValue && this.config.clearable ? null : newValue);
+        },
+
         setupResizeObserver() {
             this.resizeObserver = new ResizeObserver(() => {
                 this.handleWrappingOfNode(this.$refs.buttonGroup);

resources/js/components/structures/PageEditor.vue

@@ -25,6 +25,7 @@
                     :name="publishContainer"
                     :blueprint="adjustedBlueprint"
                     :values="values"
+                    :extra-values="extraValues"
                     :meta="meta"
                     :errors="errors"
                     :localized-fields="localizedFields"
@@ -94,6 +95,7 @@ export default {
             meta: null,
             originValues: null,
             originMeta: null,
+            extraValues: null,
             localizedFields: null,
             syncableFields: null,
             loading: true,
@@ -275,6 +277,7 @@ export default {
             this.originValues = info.originValues;
             this.meta = info.meta;
             this.originMeta = info.originMeta;
+            this.extraValues = info.extraValues;
             this.localizedFields = info.localizedFields;
             this.syncableFields = info.syncableFields;
         },
@@ -285,6 +288,7 @@ export default {
                 originValues: this.originValues,
                 meta: this.meta,
                 originMeta: this.originMeta,
+                extraValues: this.extraValues,
                 localizedFields: this.localizedFields,
                 syncableFields: this.syncableFields,
                 entry: this.entry,

resources/js/components/terms/BaseCreateForm.vue

@@ -5,7 +5,7 @@
         publish-container="base"
         :initial-actions="actions"
         method="post"
-        :initial-title="__('Create')"
+        :initial-title="taxonomyCreateLabel"
         :taxonomy-handle="taxonomyHandle"
         :breadcrumbs="breadcrumbs"
         :initial-fieldset="fieldset"
@@ -31,6 +31,7 @@ export default {
     props: [
         'actions',
         'taxonomyHandle',
+        'taxonomyCreateLabel',
         'breadcrumbs',
         'fieldset',
         'values',

resources/js/components/terms/CreateTermButton.vue

@@ -6,7 +6,7 @@
                 class="btn-primary flex items-center"
                 @click="create"
             >
-                <span v-text="__('Create Term')" />
+                <span v-text="text" />
                 <svg-icon name="micro/chevron-down-xs" class="rtl:mr-2 ltr:ml-2 -mr-2 w-2" v-if="blueprints.length > 1" />
             </button>
         </template>
@@ -25,7 +25,8 @@ export default {
 
     props: {
         url: String,
-        blueprints: Array
+        blueprints: Array,
+        text: { type: String, default: () => __('Create Term') },
     },
 
     methods: {

resources/lang/de.json

@@ -401,6 +401,7 @@
     "Enable Pro Mode": "Pro-Modus aktivieren",
     "Enable Publish Dates": "Erscheinungsdaten aktivieren",
     "Enable Revisions": "Revisionen aktivieren",
+    "Enable Statamic Pro?": "Statamic Pro aktivieren?",
     "Encryption": "Verschlüsselung",
     "Enter any internal or external URL.": "Beliebige interne oder externe URL eingeben.",
     "Enter URL": "URL eingeben",
@@ -422,7 +423,7 @@
     "Entry link": "Link zum Eintrag",
     "Entry published|Entries published": "Eintrag veröffentlicht|Einträge veröffentlicht",
     "Entry saved": "Eintrag gespeichert",
-    "Entry schedule reached": "Anmeldezeitplan erreicht",
+    "Entry schedule reached": "Zeitplan für Eintrag erreicht",
     "Entry unpublished|Entries unpublished": "Eintrag nicht veröffentlicht|Einträge nicht veröffentlicht",
     "equals": "ist gleich",
     "Equals": "Gleich",
@@ -844,7 +845,7 @@
     "Search...": "Suchen…",
     "Searchable": "Durchsuchbar",
     "Searchables": "Suchbares",
-    "Searching in:": "Suche in:",
+    "Searching in:": "Suchen in:",
     "Select": "Auswählen",
     "Select Across Sites": "Websiteübergreifend auswählen",
     "Select asset container": "Datei-Container auswählen",

resources/lang/de/fieldtypes.php

@@ -19,7 +19,7 @@
     'assets.config.restrict' => 'Verhindern, dass Benutzer:innen zu anderen Ordnern navigieren können.',
     'assets.config.show_filename' => 'Dateiname neben dem Vorschaubild anzeigen.',
     'assets.config.show_set_alt' => 'Einen Link zum Erfassen des Alt-Texts bei allen Bildern anzeigen.',
-    'assets.dynamic_folder_pending_field' => 'Dieser Upload-Ordner wird verfügbar sein, sobald :field festgelegt ist.',
+    'assets.dynamic_folder_pending_field' => 'Dieses Feld ist verfügbar, sobald :field festgelegt ist.',
     'assets.dynamic_folder_pending_save' => 'Dieses Feld ist nach dem Speichern verfügbar.',
     'assets.title' => 'Dateien',
     'bard.config.allow_source' => 'Ermöglicht beim Schreiben das Anzeigen des HTML-Quellcodes.',

resources/lang/de/messages.php

@@ -237,7 +237,7 @@
     'updater_require_version_command' => 'Führe den folgenden Befehl aus, um eine bestimmte Version anzufordern',
     'updater_update_to_latest_command' => 'Führe den folgenden Befehl aus, um die aktuelle Version zu installieren',
     'uploader_append_timestamp' => 'Zeitstempel anhängen',
-    'uploader_choose_new_filename' => 'Neuer Dateinamen wählen',
+    'uploader_choose_new_filename' => 'Neuer Dateiname wählen',
     'uploader_discard_use_existing' => 'Verwerfen und bestehende Datei verwenden',
     'uploader_overwrite_existing' => 'Bestehende Datei überschreiben',
     'user_activation_email_not_sent_error' => 'Die Aktivierungs-E-Mail konnte nicht gesendet werden. Bitte prüfe deine E-Mail-Konfiguration und versuche es erneut.',

resources/lang/de_CH.json

@@ -401,6 +401,7 @@
     "Enable Pro Mode": "Pro-Modus aktivieren",
     "Enable Publish Dates": "Erscheinungsdaten aktivieren",
     "Enable Revisions": "Revisionen aktivieren",
+    "Enable Statamic Pro?": "Statamic Pro aktivieren?",
     "Encryption": "Verschlüsselung",
     "Enter any internal or external URL.": "Beliebige interne oder externe URL eingeben.",
     "Enter URL": "URL eingeben",
@@ -422,7 +423,7 @@
     "Entry link": "Link zum Eintrag",
     "Entry published|Entries published": "Eintrag veröffentlicht|Einträge veröffentlicht",
     "Entry saved": "Eintrag gespeichert",
-    "Entry schedule reached": "Anmeldezeitplan erreicht",
+    "Entry schedule reached": "Zeitplan für Eintrag erreicht",
     "Entry unpublished|Entries unpublished": "Eintrag nicht veröffentlicht|Einträge nicht veröffentlicht",
     "equals": "ist gleich",
     "Equals": "Gleich",
@@ -844,7 +845,7 @@
     "Search...": "Suchen…",
     "Searchable": "Durchsuchbar",
     "Searchables": "Suchbares",
-    "Searching in:": "Suche in:",
+    "Searching in:": "Suchen in:",
     "Select": "Auswählen",
     "Select Across Sites": "Websiteübergreifend auswählen",
     "Select asset container": "Datei-Container auswählen",

resources/lang/de_CH/fieldtypes.php

@@ -19,7 +19,7 @@
     'assets.config.restrict' => 'Verhindern, dass Benutzer:innen zu anderen Ordnern navigieren können.',
     'assets.config.show_filename' => 'Dateiname neben dem Vorschaubild anzeigen.',
     'assets.config.show_set_alt' => 'Einen Link zum Erfassen des Alt-Texts bei allen Bildern anzeigen.',
-    'assets.dynamic_folder_pending_field' => 'Dieser Upload-Ordner wird verfügbar sein, sobald :field festgelegt ist.',
+    'assets.dynamic_folder_pending_field' => 'Dieses Feld ist verfügbar, sobald :field festgelegt ist.',
     'assets.dynamic_folder_pending_save' => 'Dieses Feld ist nach dem Speichern verfügbar.',
     'assets.title' => 'Dateien',
     'bard.config.allow_source' => 'Ermöglicht beim Schreiben das Anzeigen des HTML-Quellcodes.',

resources/lang/de_CH/messages.php

@@ -237,7 +237,7 @@
     'updater_require_version_command' => 'Führe den folgenden Befehl aus, um eine bestimmte Version anzufordern',
     'updater_update_to_latest_command' => 'Führe den folgenden Befehl aus, um die aktuelle Version zu installieren',
     'uploader_append_timestamp' => 'Zeitstempel anhängen',
-    'uploader_choose_new_filename' => 'Neuer Dateinamen wählen',
+    'uploader_choose_new_filename' => 'Neuer Dateiname wählen',
     'uploader_discard_use_existing' => 'Verwerfen und bestehende Datei verwenden',
     'uploader_overwrite_existing' => 'Bestehende Datei überschreiben',
     'user_activation_email_not_sent_error' => 'Das Aktivierungs-E-Mail konnte nicht gesendet werden. Bitte prüfe deine E-Mail-Konfiguration und versuche es erneut.',

resources/lang/en/fieldtypes.php

@@ -22,6 +22,7 @@
     'assets.dynamic_folder_pending_field' => 'This field will be available once :field is set.',
     'assets.dynamic_folder_pending_save' => 'This field will be available after saving.',
     'assets.title' => 'Assets',
+    'asset_folders.config.container' => 'Choose which asset container to use for this field.',
     'bard.config.allow_source' => 'Enable to view the HTML source code while writing.',
     'bard.config.always_show_set_button' => 'Enable to always show the "Add Set" button.',
     'bard.config.buttons' => 'Choose which buttons to show in the toolbar.',

resources/lang/fr.json

@@ -845,7 +845,7 @@
     "Search...": "Recherche...",
     "Searchable": "Consultable",
     "Searchables": "Consultables",
-    "Searching in:": "Recherche dans",
+    "Searching in:": "Recherche dans :",
     "Select": "Choisir",
     "Select Across Sites": "Choisir au sein des sites",
     "Select asset container": "Choisir un conteneur de ressources",