Matt Wilkie
|
32bb43f9c1
|
fix indent
|
2025-02-17 13:55:55 -07: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 |
|
Elian Doran
|
50d37bbcb1
|
chore(client/ts): port note_type
|
2025-02-17 22:28:54 +02:00 |
|
Elian Doran
|
6706332be3
|
Merge pull request #1204 from TriliumNext/feat_timeScaleSelectWidget
feat: add time selector option widget
|
2025-02-17 22:23:29 +02:00 |
|
Matt Wilkie
|
2ec2d784ec
|
results of npx prettier
|
2025-02-17 13:19:55 -07:00 |
|
Elian Doran
|
16caae191e
|
fix(geomap): stuck viewport and zoom when switching between two geomaps
|
2025-02-17 21:59:02 +02:00 |
|
Elian Doran
|
c7d75b759c
|
feat(webview): remove disclaimer
|
2025-02-17 21:50:59 +02:00 |
|
Elian Doran
|
b837c57d06
|
chore(lock): update
|
2025-02-17 21:49:34 +02:00 |
|
Elian Doran
|
ef3a75d58e
|
feat(webview): set up some sandboxing for <iframe>
|
2025-02-17 21:49:24 +02:00 |
|
Elian Doran
|
59b474df35
|
feat(webview): render in browser using iframe
|
2025-02-17 21:26:00 +02:00 |
|
Elian Doran
|
fd47412d51
|
chore(client/ts): port web_view
|
2025-02-17 21:22:58 +02:00 |
|
Elian Doran
|
237f2ead73
|
fix(ci): server platform name missing due to invalid input
|
2025-02-17 21:16:53 +02:00 |
|
Elian Doran
|
558bee72e9
|
fix(ci): add missing zip for Windows on nightly
|
2025-02-17 21:15:12 +02:00 |
|
Elian Doran
|
ed082f34d5
|
fix(ci): add missing zip for Windows
|
2025-02-17 21:01:06 +02:00 |
|
Elian Doran
|
fabafeac86
|
fix(ci): missing os name in server release artifact
|
2025-02-17 19:53:25 +02:00 |
|
Elian Doran
|
4dd531e036
|
chore(release): 0.92.0-beta
v0.92.0-beta
|
2025-02-17 19:29:59 +02:00 |
|
Elian Doran
|
7bcfb1df96
|
chore(docs): minor updates
|
2025-02-17 19:28:54 +02:00 |
|
Elian Doran
|
e39bee23aa
|
fix(electron): background effects on fixed light/dark mode (closes #1209)
|
2025-02-17 18:07:36 +02:00 |
|
Elian Doran
|
5550885206
|
fix(build): run prepare-dist for electron-forge:make
|
2025-02-17 17:42:15 +02:00 |
|
Panagiotis Papadopoulos
|
d26d668741
|
feat(time_selector): avoid "template concatenation"
|
2025-02-17 09:00:44 +01:00 |
|
Panagiotis Papadopoulos
|
fc8f805b28
|
i18n(time_selector): adjust attachment erasure message
as we now are allowing entering the time in other formats (minutes, hours, days) – it doesn't make sense for the label to say "after X seconds".
|
2025-02-17 06:52:29 +01:00 |
|
matt wilkie
|
ed8b8e50a4
|
feature complete; tested and working on local linux machine
|
2025-02-16 22:47:50 -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 |
|
matt wilkie
|
7af4e52766
|
brought over changes from 879035d
The last known good state before I got sidetracked into docker changes
|
2025-02-16 21:29:38 -07:00 |
|
Elian Doran
|
152f3193d1
|
Merge pull request #1183 from TriliumNext/feature/calendar_view
Calendar view
|
2025-02-16 20:16:02 +02:00 |
|
Elian Doran
|
725a9fc333
|
feat(view/calendar): add help
|
2025-02-16 19:57:44 +02:00 |
|
Panagiotis Papadopoulos
|
ccbed7bbc3
|
feat(time_selector): use showError since this is an error
|
2025-02-16 18:30:56 +01:00 |
|
Panagiotis Papadopoulos
|
10ba467202
|
chore(prettier): run prettier on time_selector related files
|
2025-02-16 18:30:56 +01:00 |
|
Panagiotis Papadopoulos
|
793b0c9fe8
|
feat(time_selector): add possibility to omit time scales
|
2025-02-16 18:30:56 +01:00 |
|
Panagiotis Papadopoulos
|
35a3d326f7
|
i18n(time_selector): translate invalid_input message
|
2025-02-16 18:30:56 +01:00 |
|
Panagiotis Papadopoulos
|
f672054441
|
feat(time_selector): use time_selector in attachment_erasure_timeout
|
2025-02-16 18:30:56 +01:00 |
|
Panagiotis Papadopoulos
|
e0e530b219
|
feat(time_selector): use time_selector in note_erasure_timeout
|
2025-02-16 18:30:56 +01:00 |
|
Panagiotis Papadopoulos
|
c0714a92d5
|
feat(time_selector): add time_selector options widget
|
2025-02-16 18:30:56 +01:00 |
|
Elian Doran
|
114a70b442
|
feat(view/calendar): remove redundant margin when in zen mode
|
2025-02-16 19:20:59 +02:00 |
|
Elian Doran
|
169b2269b1
|
feat(view/calendar): improve display when creating empty note
|
2025-02-16 19:17:15 +02:00 |
|
Elian Doran
|
e73ea36161
|
feat(in_app_help): contextual help for book types
|
2025-02-16 18:09:01 +02:00 |
|
Elian Doran
|
c17d10114f
|
feat(mobile): enable prompt dialog for inserting notes
|
2025-02-16 17:52:04 +02:00 |
|
Elian Doran
|
5677be2dd5
|
Merge remote-tracking branch 'origin/develop' into feature/calendar_view
|
2025-02-16 17:43:04 +02:00 |
|
Adorian Doran
|
fbacb5bb71
|
Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop
|
2025-02-16 15:48:42 +02:00 |
|
Adorian Doran
|
630eb5ac8d
|
style(next): restyle the alert bar
|
2025-02-16 15:47:44 +02:00 |
|
Elian Doran
|
a532ae6426
|
Merge pull request #1196 from TriliumNext/feature/zen_mode
Zen Mode
|
2025-02-16 15:39:54 +02:00 |
|
Elian Doran
|
dc0ac4daa2
|
fix(zen): buttons on darwin
|
2025-02-16 15:38:31 +02:00 |
|
Elian Doran
|
753da46935
|
Merge remote-tracking branch 'origin/develop' into feature/zen_mode
|
2025-02-16 15:24:28 +02:00 |
|
Elian Doran
|
569ed0868d
|
Merge pull request #1195 from dousha/bugfix-unsharing-hoisted
Allow removing weak branches even if it's hoisted
|
2025-02-16 15:05:17 +02:00 |
|
Elian Doran
|
324233be50
|
Merge pull request #1201 from TriliumNext/chore_fix-copy-dist-log
chore(copy-dist): "unpack" log messages before printing
|
2025-02-16 15:00:41 +02:00 |
|
Elian Doran
|
135f3d913a
|
Merge pull request #1191 from TriliumNext/chore_npm-scripts-namescape
chore: npm scripts namespacing
|
2025-02-16 14:58:29 +02:00 |
|
Elian Doran
|
ee5cc18ef2
|
fix(view/calendar): end date offset on display
|
2025-02-16 13:34:39 +02:00 |
|
Elian Doran
|
6d3325766d
|
feat(view/calendar): refresh calendar when entities change
|
2025-02-16 13:22:44 +02:00 |
|
Elian Doran
|
eff93d8e27
|
Merge remote-tracking branch 'origin/develop' into feature/calendar_view
|
2025-02-16 11:47:54 +02:00 |
|