Merge branch 'statamic:6.x' into 6.x

Author: Devsome

.storybook/preview.ts

@@ -8,6 +8,7 @@ import './theme.css';
 import {translate} from '@/translations/translator';
 import registerUiComponents from '@/bootstrap/ui';
 import DateFormatter from '@/components/DateFormatter';
+import NumberFormatter from '@/components/NumberFormatter';
 import cleanCodeSnippet from './clean-code-snippet';
 import PortalVue from 'portal-vue';
 import FullscreenHeader from '@/components/publish/FullscreenHeader.vue';
@@ -63,6 +64,7 @@ setup(async (app) => {
 
   app.config.globalProperties.__ = translate;
   app.config.globalProperties.$date = new DateFormatter;
+  app.config.globalProperties.$number = new NumberFormatter;
   app.config.globalProperties.cp_url = (url) => url;
   app.config.globalProperties.$portals = portals;
   app.config.globalProperties.$stacks = stacks;

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Release Notes
 
+## 6.8.0 (2026-03-27)
+
+### What's new
+- GraphQL API Authentication [#14292](https://github.com/statamic/cms/issues/14292) by @duncanmcclean
+- Ability to disable two-factor authentication [#14263](https://github.com/statamic/cms/issues/14263) by @duncanmcclean
+- Ability to select the date formatting locale [#14372](https://github.com/statamic/cms/issues/14372) by @jasonvarga
+- Number formatter [#14373](https://github.com/statamic/cms/issues/14373) by @jasonvarga
+
+### What's fixed
+- Omit application name and URL from support:details [#14359](https://github.com/statamic/cms/issues/14359) by @jasonvarga
+- Fix CP Nav active state when trailing slashes are enforced [#14363](https://github.com/statamic/cms/issues/14363) by @duncanmcclean
+- Only change date for localizations with an explicit date set [#14362](https://github.com/statamic/cms/issues/14362) by @duncanmcclean
+- Bring back responsive button groups [#13336](https://github.com/statamic/cms/issues/13336) by @daun
+- Merge external class attrs through twMerge in UI components [#14379](https://github.com/statamic/cms/issues/14379) by @jasonvarga
+- Reduce amount of data provided in Assets fieldtype meta [#14366](https://github.com/statamic/cms/issues/14366) by @duncanmcclean
+- Filters can only be removed by clicking cross [#14220](https://github.com/statamic/cms/issues/14220) by @jaygeorge
+- Bump reka-ui [#14368](https://github.com/statamic/cms/issues/14368) by @jasonvarga
+- Bump picomatch from 2.3.1 to 2.3.2 [#14360](https://github.com/statamic/cms/issues/14360) by @dependabot
+
+
+
 ## 6.7.3 (2026-03-25)
 
 ### What's fixed

config/users.php

@@ -181,6 +181,18 @@
 
     'elevated_session_duration' => 15,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Two-Factor Authentication
+    |--------------------------------------------------------------------------
+    |
+    | Here you may disable two-factor authentication entirely. This can be
+    | useful on local or staging environments, or when using OAuth.
+    |
+    */
+
+    'two_factor_enabled' => env('STATAMIC_TWO_FACTOR_ENABLED', true),
+
     /*
     |--------------------------------------------------------------------------
     | Enforce Two-Factor Authentication

lang/en/messages.php

@@ -198,6 +198,8 @@
     'phpinfo_utility_description' => 'Check PHP configuration settings and installed modules.',
     'plus_count_more' => '+ :count more',
     'preference_confirm_dirty_navigation_instructions' => 'Whether you should get a warning when trying to leave the page when there are unsaved changes.',
+    'preference_formatting_locale_invalid' => 'Please enter a valid locale code.',
+    'preference_formatting_locale_instructions' => 'The locale used for formatting values in the control panel, such as dates and numbers.',
     'preference_locale_instructions' => 'The preferred language for the control panel.',
     'preference_start_page_instructions' => 'The page to be shown when logging into the control panel.',
     'preference_strict_accessibility_instructions' => 'We\'ve designed the control panel with accessibility in mind, aiming to meet WCAG 2.2 guidelines where possible. Enable this option to apply stricter accessibility rules by increasing form border contrast.',

package-lock.json

@@ -14,6 +14,7 @@ export const {
     hooks,
     inertia,
     keys,
+    numberFormatter,
     permissions,
     portals,
     preferences,

packages/cms/src/api.js

@@ -8,6 +8,7 @@ export const {
     IndexFieldtypeMixin,
     InlineEditForm,
     DateFormatter,
+    NumberFormatter,
     ItemActions,
     RelatedItem,
     RestoreRevision,

packages/cms/src/index.js

@@ -114,6 +114,7 @@ export const {
     TabProvider,
     Tabs,
     TabTrigger,
+    Text,
     Textarea,
     TimePicker,
     ToggleGroup,

packages/cms/src/ui.js

@@ -14,6 +14,7 @@ import Reveal from './components/Reveal.js';
 import Echo from './components/Echo.js';
 import Permission from './components/Permission.js';
 import DateFormatter from './components/DateFormatter.js';
+import NumberFormatter from './components/NumberFormatter.js';
 import CommandPalette from './components/CommandPalette.js';
 import ColorMode from './components/ColorMode.js';
 import Contrast from './components/Contrast.js';
@@ -39,6 +40,7 @@ export const reveal = new Reveal();
 export const echo = new Echo();
 export const permissions = new Permission();
 export const dateFormatter = new DateFormatter();
+export const numberFormatter = new NumberFormatter();
 export const commandPalette = new CommandPalette();
 export const colorMode = new ColorMode();
 export const contrast = new Contrast();

resources/js/api.js

@@ -3,6 +3,7 @@ export { default as IndexFieldtype } from '../../components/fieldtypes/index-fie
 export { default as FieldtypeMixin } from '../../components/fieldtypes/Fieldtype.vue';
 export { default as IndexFieldtypeMixin } from '../../components/fieldtypes/IndexFieldtype.vue';
 export { default as DateFormatter } from '../../components/DateFormatter.js';
+export { default as NumberFormatter } from '../../components/NumberFormatter.js';
 export { default as ItemActions } from '../../components/actions/ItemActions.vue';
 export { default as InlineEditForm } from '../../components/inputs/relationship/InlineEditForm.vue';
 export { default as RelatedItem } from '../../components/inputs/relationship/Item.vue';