mirror of
https://github.com/apache/superset.git
synced 2026-07-19 21:25:38 +00:00
2c63525d4b
Resolved conflicts: - UPDATING.md: kept both — PR #39925 subdirectory-deployment block and master's Intl.DurationFormat block are independent "Next" entries. - superset/translations/messages.pot + 26 .po files: took master's baseline (--theirs) and re-extracted via babel_update.sh so PR-introduced strings are folded into master's updated catalog. Inbound master highlights: - Intl.DurationFormat replaces pretty-ms (#39330) - Streaming-export guest-token plumbing (#40712) - ChartRenderer/Chart/DrillByChart converted to function components - Routine dep bumps (react-map-gl, @ant-design/icons, dayjs, etc.) Rebuilt superset-ui-core .d.ts via tsc -b so the new createDurationFormatter locale option is visible to pre-commit type-checking. Verified Slice 8 navigateTo/navigateWithState edits in dashboardState.ts and SupersetClient routing edits in useStreamingExport.ts survived auto-merge.