perfectra1n 6593470289 Merge origin/main into feat/fun-take1 ...

Resolve merge conflicts in:
- apps/client/src/widgets/highlights_list.ts (keep math formula handling)
- apps/server/src/routes/api/options.ts (keep isReadable/isAllowed split, drop dead getSupportedLocales)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-04-12 11:01:38 -07:00

..

build-docs

chore(deps): update dependency @redocly/cli to v2.26.0

2026-04-12 00:44:11 +00:00

client

Merge origin/main into feat/fun-take1

2026-04-12 11:01:38 -07:00

db-compare

fix(deps): update dependency diff to v8.0.4

2026-03-24 12:32:24 +00:00

desktop

chore(deps): update dependency electron to v41.2.0

2026-04-12 00:45:14 +00:00

dump-db

fix(deps): update dependency sanitize-filename to v1.6.4

2026-03-21 02:03:10 +00:00

edit-docs

chore(deps): update dependency electron to v41.2.0

2026-04-12 00:45:14 +00:00

icon-pack-builder

chore: address requested changes

2026-02-07 12:38:41 +02:00

server

Merge origin/main into feat/fun-take1

2026-04-12 11:01:38 -07:00

server-e2e

chore(deps): update dependency dotenv to v17.4.1

2026-04-09 01:13:19 +00:00

web-clipper

fix(web-clipper): Remove trailing / from triliumServerUrl

2026-04-08 16:38:17 +02:00

website

fix(deps): update dependency i18next to v26.0.4

2026-04-12 00:43:10 +00:00