20 Commits

Author SHA1 Message Date
Jin
c3d3ab4330 Merge branch 'develop' into feature/MFA 2025-03-22 14:38:22 +01:00
Jin
fdc10d0120 feat: 🎸 fix ts error 2025-03-22 12:35:37 +01:00
Elian Doran
cf874b5ee8
feat(mermaid): add basic support for vertical layout 2025-03-22 10:27:42 +02:00
Elian Doran
1976fe6729
Merge remote-tracking branch 'origin/develop' into feature/rtl
; Conflicts:
;	src/public/app/widgets/floating_buttons/help_button.ts
2025-03-05 21:57:53 +02:00
Elian Doran
e7d2be4663
feat(options/language): store list of languages 2025-03-02 21:58:40 +02:00
Panagiotis Papadopoulos
2beaaa95bf chore(prettier): fix code style 2025-03-02 20:47:57 +01:00
Elian Doran
46f543ad54
Merge pull request #1207 from maphew/bare2share2
Bare2share - Redirect bare domain to defined #shareRoot
2025-02-22 09:25:30 +02:00
Elian Doran
38dbf6efcd
Merge pull request #1220 from TriliumNext/feat_friendly-numbers-note-revision
feat: friendly numbers note revision
2025-02-22 09:24:37 +02:00
Panagiotis Papadopoulos
9a1d26e129 feat: add protectedSessionTimeoutScale option
to be used in the protected_session_timeout widget, when it is ported to use TimeSelector
2025-02-18 22:37:20 +01:00
Panagiotis Papadopoulos
eeb99cf37c feat: add revisionSnapshotTimeIntervalTimeScale option
to be used in the revision_snapshot_interval widget, when it is ported to use TimeSelector
2025-02-18 22:29:56 +01:00
Matt Wilkie
86ab2d4008 Merge remote-tracking branch 'origin/develop' into bare2share2
# Conflicts:
#	src/public/translations/en/translation.json
2025-02-17 13:54:40 -07:00
Matt Wilkie
657638ee54 responding to code review (thanks pano!) 2025-02-17 13:46:03 -07:00
matt wilkie
bc66e98533 okay, we can start npm server now, but new db redirects to share 2025-02-16 22:17:59 -07:00
Panagiotis Papadopoulos
f672054441 feat(time_selector): use time_selector in attachment_erasure_timeout 2025-02-16 18:30:56 +01:00
Panagiotis Papadopoulos
2bb79c4209 feat: "friendly number handling" for note erasure timeouts 2025-02-11 09:06:29 +01:00
Elian Doran
05529b84ab
chore(client/ts): port options 2025-01-11 11:45:06 +02:00
Elian Doran
324696bc54
refactor(ts): enable verbatim module syntax 2025-01-09 18:36:24 +02:00
Elian Doran
4cbb529fd4
chore(prettier): fix all files 2025-01-09 18:07:02 +02:00
Elian Doran
80af0899b8
chore(types): font families 2025-01-03 20:08:58 +02:00
Elian Doran
428ffa7826
chore(client/ts): port options_widget 2025-01-03 18:40:52 +02:00