gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3078 from sigaloid/master

Browse Source 
Add compression middleware
This commit is contained in:
zadam 2022-08-22 19:27:16 +02:00 committed by GitHub
commit 67b8f3206c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app.js
View File

@ -5,6 +5,7 @@ const favicon = require('serve-favicon');
const cookieParser = require('cookie-parser'); const cookieParser = require('cookie-parser');
const helmet = require('helmet'); const helmet = require('helmet');
const session = require('express-session'); const session = require('express-session');
const compression = require('compression')
const FileStore = require('session-file-store')(session); const FileStore = require('session-file-store')(session);
const sessionSecret = require('./services/session_secret'); const sessionSecret = require('./services/session_secret');
const dataDir = require('./services/data_dir'); const dataDir = require('./services/data_dir');
@ -18,6 +19,9 @@ const app = express();
app.set('views', path.join(__dirname, 'views')); app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'ejs'); app.set('view engine', 'ejs');
// add compression
app.use(compression())
app.use(helmet({ app.use(helmet({
hidePoweredBy: false, // errors out in electron hidePoweredBy: false, // errors out in electron
contentSecurityPolicy: false, contentSecurityPolicy: false,

2
src/public/app/widgets/search_options/ancestor.js
View File

@ -13,7 +13,7 @@ const TPL = `
<div style="margin-left: 10px; margin-right: 10px">depth:</div> <div style="margin-left: 10px; margin-right: 10px">depth:</div>
<select name="depth" class="form-control d-inline ancestor-depth" style="flex-shrink: 3"> <select name="depth" class="form-control d-inline ancestor-depth" style="flex-shrink: 3">
<option value="">doesn't mattter</option> <option value="">doesn't matter</option>
<option value="eq1">is exactly 1 (direct children)</option> <option value="eq1">is exactly 1 (direct children)</option>
<option value="eq2">is exactly 2</option> <option value="eq2">is exactly 2</option>
<option value="eq3">is exactly 3</option> <option value="eq3">is exactly 3</option>