zadam
|
6e69cafe54
|
fix showing deleted notes in the recent changes dialog, closes #4013
|
2023-06-08 22:45:44 +02:00 |
|
zadam
|
38839532d5
|
file upload WIP
|
2023-06-06 12:31:38 +02:00 |
|
zadam
|
3b3f6082a7
|
attachment ETAPI support WIP
|
2023-06-05 09:23:42 +02:00 |
|
zadam
|
93addac8bb
|
Merge branch 'master' into next61
# Conflicts:
# src/becca/entities/bnote.js
# src/public/app/components/note_context.js
# src/public/app/layouts/desktop_layout.js
# src/public/app/services/note_content_renderer.js
# src/public/app/services/utils.js
# src/public/app/widgets/ribbon_widgets/file_properties.js
# src/public/app/widgets/ribbon_widgets/note_info_widget.js
# src/services/notes.js
|
2023-06-05 00:09:55 +02:00 |
|
zadam
|
779751a234
|
rename "note revision" to just "revision"
|
2023-06-04 23:01:40 +02:00 |
|
SiriusXT
|
1413756d00
|
Show highlighted text in right panel
|
2023-06-03 11:55:50 +08:00 |
|
SiriusXT
|
86861f6ec3
|
Show highlighted text in the left pane
|
2023-05-31 18:32:33 +08:00 |
|
zadam
|
df17840dbc
|
fixes attachments
|
2023-05-29 13:02:25 +02:00 |
|
zadam
|
0aa119af2c
|
attachments WIP
|
2023-05-29 00:19:54 +02:00 |
|
zadam
|
c2f70031d0
|
Merge branch 'master' into next61
# Conflicts:
# package-lock.json
# package.json
# src/public/app/entities/fnote.js
# src/public/app/services/link.js
|
2023-05-28 16:57:48 +02:00 |
|
baiyongjie
|
9d49264258
|
cleaup
|
2023-05-26 14:54:13 +08:00 |
|
baiyongjie
|
6098d62dcc
|
fix getEditedNotesOnDate
|
2023-05-26 14:36:21 +08:00 |
|
zadam
|
579ed7e194
|
attachment content rendering
|
2023-05-21 18:14:17 +02:00 |
|
zadam
|
e20fac19ba
|
attachment WIP
|
2023-05-20 23:46:45 +02:00 |
|
zadam
|
ff5d3a5f0c
|
import WIP
|
2023-05-09 00:05:27 +02:00 |
|
zadam
|
626af84f42
|
refactoring + uploading attachments WIP
|
2023-05-08 00:02:08 +02:00 |
|
zadam
|
64db5e2542
|
cleanup of app.js, wwww
|
2023-05-07 15:23:46 +02:00 |
|
zadam
|
4d5612e845
|
fix updating non-text notes
|
2023-05-07 11:20:51 +02:00 |
|
zadam
|
cc02546ed3
|
Merge remote-tracking branch 'origin/master' into next60
# Conflicts:
# src/routes/api/options.js
# src/services/import/zip.js
# src/services/options_init.js
|
2023-05-07 09:41:33 +02:00 |
|
zadam
|
f6944b8219
|
introducing meta types for import/export, fixes for attachments export
|
2023-05-06 14:38:45 +02:00 |
|
zadam
|
fa3cbb4645
|
grammar
|
2023-05-05 23:41:11 +02:00 |
|
zadam
|
6dfc72c065
|
many small fixes from Intellij analysis
|
2023-05-05 23:17:23 +02:00 |
|
zadam
|
0af6f91d21
|
exposing blobs in APIs
|
2023-05-05 22:21:51 +02:00 |
|
zadam
|
5e1f81e53e
|
getting rid of note complement WIP
|
2023-05-05 16:37:39 +02:00 |
|
zadam
|
78d83b8826
|
fix note size calculation with blobs
|
2023-05-05 15:18:55 +02:00 |
|
zadam
|
8edf06d28d
|
small refactorings
|
2023-05-04 22:16:18 +02:00 |
|
zadam
|
ecd2a5cbac
|
Merge remote-tracking branch 'origin/master' into next60
|
2023-05-04 21:01:53 +02:00 |
|
Nriver
|
22587ee6b5
|
customize search engine
|
2023-05-04 14:57:33 +08:00 |
|
zadam
|
cd01886eb2
|
attachment revision upload
|
2023-05-03 22:49:24 +02:00 |
|
zadam
|
d8bc9c2982
|
attachment actions
|
2023-05-03 10:23:20 +02:00 |
|
zadam
|
735ac55bb8
|
fixes, allowing conversion of note into an attachment
|
2023-05-02 22:46:39 +02:00 |
|
zadam
|
4f1fafdf75
|
Merge pull request #3870 from soulsands/perf-count
perf: improve descendant count performance
|
2023-04-28 21:53:41 +02:00 |
|
zadam
|
49fb913eab
|
erasing unused attachments
|
2023-04-24 21:22:34 +02:00 |
|
zadam
|
4b074365e7
|
Merge branch 'master' into next60
|
2023-04-24 20:21:45 +02:00 |
|
zadam
|
0896000fcd
|
Merge branch 'stable'
|
2023-04-24 20:21:22 +02:00 |
|
Castor
|
e007aba067
|
Update note_map.js
|
2023-04-24 13:43:19 +08:00 |
|
zadam
|
eff567ee48
|
wrong password login screen should return 401 so that it counts to the rate limiter, fixes #3867
|
2023-04-23 22:22:05 +02:00 |
|
baiyongjie
|
89681977b5
|
perf: improve descendant count performance
|
2023-04-23 15:36:34 +08:00 |
|
soulsands
|
c3c6d73bb2
|
fix: match custom path strictly
|
2023-04-22 19:37:49 +08:00 |
|
zadam
|
5e2efca933
|
scheduled erasure of attachments WIP
|
2023-04-21 00:19:17 +02:00 |
|
zadam
|
c6c162cdda
|
restore revision with attachments
|
2023-04-19 22:47:33 +02:00 |
|
zadam
|
0e4a040ed8
|
fixes of new attachment URLs
|
2023-04-17 22:40:53 +02:00 |
|
zadam
|
b84670d503
|
Merge branch 'master' into next60
|
2023-04-17 22:27:21 +02:00 |
|
zadam
|
63e044ffdf
|
refactoring
|
2023-04-16 11:28:24 +02:00 |
|
zadam
|
a1d4e062ed
|
refactoring of "some path" WIP
|
2023-04-16 09:22:24 +02:00 |
|
zadam
|
7aa26580ba
|
refactoring of "some path" WIP
|
2023-04-15 00:06:13 +02:00 |
|
zadam
|
f01657e1dd
|
refactorings
|
2023-04-14 16:49:06 +02:00 |
|
zadam
|
3f8bf7cacc
|
renamed openTabs to openNoteContexts
|
2023-04-11 22:00:04 +02:00 |
|
zadam
|
17128c5874
|
navigation state is more nicely and completely serialized into URL
|
2023-04-11 21:41:55 +02:00 |
|
zadam
|
15a11daf38
|
Merge branch 'master' into next60
# Conflicts:
# package-lock.json
# package.json
|
2023-04-10 18:52:30 +02:00 |
|