sinvo/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost.git synced 2026-08-30 02:25:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/integrations

Browse Source 
# Conflicts:
#	apps/client/src/App.tsx
#	apps/server/src/ee
#	apps/server/src/integrations/queue/constants/queue.constants.ts
#	apps/server/src/integrations/queue/queue.module.ts
#	packages/editor-ext/src/index.ts
This commit is contained in:
Philipinho
2026-08-07 01:13:39 +01:00
parent 3e3e09133b 89378ee766
commit 139cc82326
406 changed files with 33557 additions and 5788 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/App.tsx
+3
View File
@@ -41,6 +41,7 @@ import AiSettings from "@/ee/ai/pages/ai-settings.tsx";
import Integrations from "@/features/integration/pages/integrations.tsx";
import Connections from "@/features/integration/pages/connections.tsx";
import SlackLinkPage from "@/features/integration/pages/slack-link.tsx";
import BasePage from "@/ee/base/pages/base-page.tsx";
import AuditLogs from "@/ee/audit/pages/audit-logs.tsx";
import VerifiedPages from "@/ee/page-verification/pages/verified-pages.tsx";
import TemplateList from "@/ee/template/pages/template-list";
@@ -110,6 +111,8 @@ export default function App() {
element={<Page />}
/>
<Route path={"/base/:pageId"} element={<BasePage />} />
<Route path={"/settings"}>
<Route path={"account/profile"} element={<AccountSettings />} />
<Route