gawells/Stalwart-webui
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/main' into sync-upstream

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json
#	src/components/common/CommandPalette.tsx
#	src/components/common/LoadingFallback.tsx
#	src/components/common/Logo.tsx
#	src/components/forms/DynamicForm.tsx
#	src/components/forms/FieldWidget.tsx
#	src/components/layout/MainContent.tsx
#	src/components/layout/Sidebar.tsx
#	src/components/layout/TopBar.tsx
#	src/components/lists/DynamicList.tsx
#	src/components/ui/calendar.tsx
#	src/components/ui/command.tsx
#	src/components/ui/dialog.tsx
#	src/hooks/useDocumentTitle.ts
#	src/hooks/useGlobalSearch.ts
#	src/i18n/en.json
#	src/lib/lastVisited.ts
#	src/lib/logoCache.ts
#	src/pages/AdminPanel.lazy.tsx
#	src/pages/AdminPanel.tsx
#	src/pages/LoginPage.tsx
#	src/pages/NotFound.tsx
#	src/pages/OAuthCallback.tsx
#	src/stores/authStore.test.ts
#	src/stores/authStore.ts
#	src/stores/cacheStore.ts
#	vite.config.ts
This commit is contained in:
Steven RYDELL
2026-08-01 16:59:31 +02:00
parent a4b324bb8b 8cab61a9c5
commit 4c953e599d
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.tsx
+3
View File
@@ -16,6 +16,7 @@ import NotFound from './pages/NotFound';
import { AdminPanel } from './pages/AdminPanel.lazy'; import { AdminPanel } from './pages/AdminPanel.lazy';
import { ProtectedRoute } from './components/layout/ProtectedRoute'; import { ProtectedRoute } from './components/layout/ProtectedRoute';
import { getBasePath } from './lib/basePath'; import { getBasePath } from './lib/basePath';
import { loadLogoOnce } from './lib/logoCache';
(() => { (() => {
try { try {
@@ -42,6 +43,8 @@ import { getBasePath } from './lib/basePath';
} catch {} } catch {}
})(); })();
loadLogoOnce();
const basePath = getBasePath(); const basePath = getBasePath();
const router = createBrowserRouter( const router = createBrowserRouter(
src/types/schema.ts
+1 -5
View File
@@ -256,11 +256,7 @@ export interface MassActionSeparator {
} }
export type ItemAction = export type ItemAction =
| ItemActionDelete ItemActionDelete | ItemActionSetProperty | ItemActionQuery | ItemActionView | ItemActionSeparator;
| ItemActionSetProperty
| ItemActionQuery
| ItemActionView
| ItemActionSeparator;
export interface ItemActionDelete { export interface ItemActionDelete {
type: 'delete'; type: 'delete';