Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-10 07:15:51 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into feature/MFA

Browse Source
This commit is contained in:
Elian Doran
2024-12-24 13:26:02 +02:00
parent 120f1677e8 728695e016
commit 2eb4d4fb66
825 changed files with 36174 additions and 82006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app.ts
View File

@@ -59,13 +59,14 @@ app.use(cookieParser());
app.use(express.static(path.join(scriptDir, 'public/root')));
app.use(`/manifest.webmanifest`, express.static(path.join(scriptDir, 'public/manifest.webmanifest')));
app.use(`/robots.txt`, express.static(path.join(scriptDir, 'public/robots.txt')));
app.use(`/icon.png`, express.static(path.join(scriptDir, 'public/icon.png')));
app.use(sessionParser);
app.use(favicon(`${scriptDir}/../images/app-icons/icon.ico`));
if (openID.checkOpenIDRequirements())
if (openID.checkOpenIDRequirements())
app.use(oidc.auth(openID.generateOAuthConfig()));
assets.register(app);
await assets.register(app);
routes.register(app);
custom.register(app);
error_handlers.register(app);