Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-29 19:12:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'TriliumNext:develop' into develop

Browse Source
This commit is contained in:
Yiran Lu 2025-04-15 16:11:16 +02:00 committed by GitHub
commit 0fa084711e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Release Notes/Release Notes/v0.92.8-beta.md
View File

@ -12,6 +12,8 @@
* [Most tree context menu on mobile are broken](https://github.com/TriliumNext/Notes/issues/671) * [Most tree context menu on mobile are broken](https://github.com/TriliumNext/Notes/issues/671)
* [Quick search launch bar item does nothing in vertical layout](https://github.com/TriliumNext/Notes/issues/1680) * [Quick search launch bar item does nothing in vertical layout](https://github.com/TriliumNext/Notes/issues/1680)
* [Note background is gray in 0.92.7 (light theme)](https://github.com/TriliumNext/Notes/issues/1689) * [Note background is gray in 0.92.7 (light theme)](https://github.com/TriliumNext/Notes/issues/1689)
* [config.Session.cookieMaxAge is ignored](https://github.com/TriliumNext/Notes/issues/1709) by @pano9000
* [Return correct HTTP status code on failed login attempts instead of 200](https://github.com/TriliumNext/Notes/issues/1707) by @pano9000
## ✨ Improvements ## ✨ Improvements

2
src/public/app/widgets/type_widgets/ckeditor/config.ts
View File

@ -74,7 +74,7 @@ export function buildConfig() {
heading: { heading: {
options: [ options: [
{ model: "paragraph" as const, title: "Paragraph", class: "ck-heading_paragraph" }, { model: "paragraph" as const, title: "Paragraph", class: "ck-heading_paragraph" },
// // heading1 is not used since that should be a note's title // heading1 is not used since that should be a note's title
{ model: "heading2" as const, view: "h2", title: "Heading 2", class: "ck-heading_heading2" }, { model: "heading2" as const, view: "h2", title: "Heading 2", class: "ck-heading_heading2" },
{ model: "heading3" as const, view: "h3", title: "Heading 3", class: "ck-heading_heading3" }, { model: "heading3" as const, view: "h3", title: "Heading 3", class: "ck-heading_heading3" },
{ model: "heading4" as const, view: "h4", title: "Heading 4", class: "ck-heading_heading4" }, { model: "heading4" as const, view: "h4", title: "Heading 4", class: "ck-heading_heading4" },

9
src/routes/login.ts
View File

@ -92,11 +92,10 @@ function login(req: Request, res: Response) {
const rememberMe = req.body.rememberMe; const rememberMe = req.body.rememberMe;
req.session.regenerate(() => { req.session.regenerate(() => {
if (rememberMe) { if (!rememberMe) {
req.session.cookie.maxAge = 21 * 24 * 3600000; // 3 weeks
} else {
// unset default maxAge set by sessionParser // unset default maxAge set by sessionParser
// Cookie becomes non-persistent and expires after current browser session (e.g. when browser is closed) // Cookie becomes non-persistent and expires
// after current browser session (e.g. when browser is closed)
req.session.cookie.maxAge = undefined; req.session.cookie.maxAge = undefined;
} }
@ -134,7 +133,7 @@ function sendLoginError(req: Request, res: Response, errorType: 'password' | 'to
log.info(`WARNING: Wrong password from ${req.ip}, rejecting.`); log.info(`WARNING: Wrong password from ${req.ip}, rejecting.`);
} }
res.render('login', { res.status(401).render('login', {
wrongPassword: errorType === 'password', wrongPassword: errorType === 'password',
wrongTotp: errorType === 'totp', wrongTotp: errorType === 'totp',
totpEnabled: totp.isTotpEnabled(), totpEnabled: totp.isTotpEnabled(),