Commit Graph

6634 Commits

Author SHA1 Message Date
zadam cb2b97635a centering icons in note book vertically 2023-06-22 23:34:05 +02:00
zadam 176784834f simple formatter for source view of text HTML notes 2023-06-20 23:59:36 +02:00
zadam a47004bb4e shift migrations after upmerge 2023-06-20 23:32:31 +02:00
zadam 995f1c9fc4 Merge branch 'stable' into next61
# Conflicts:
#	src/etapi/etapi.openapi.yaml
#	src/etapi/notes.js
#	src/public/app/widgets/type_widgets/editable_text.js
#	src/services/app_info.js
2023-06-20 23:30:45 +02:00
zadam 1f3b6feaff Merge branch 'master' into next61
# Conflicts:
#	src/public/app/widgets/note_tree.js
2023-06-20 23:28:41 +02:00
zadam 8095c77b91 cache icon count to make filtering more responsive on slower connections, #4044 2023-06-20 21:31:25 +02:00
zadam 6cfd18b29b read filter values in icon selector only after async events, #4044 2023-06-20 21:19:56 +02:00
zadam defd997424 release 0.60.4 v0.60.4 2023-06-19 23:26:50 +02:00
zadam 5905950c17 fix notePosition assignment for new children of root 2023-06-19 00:29:36 +02:00
zadam 691fccb769 fix keyboard navigation in the note tree, fixes #4036 2023-06-18 23:45:48 +02:00
zadam bbe3f436d3 avoid scrolling to active node without a reason, fixes #4031 2023-06-18 21:50:22 +02:00
zadam e22f77eae7 release 0.60.3 v0.60.3 2023-06-15 23:23:37 +02:00
zadam 3223e76787 etapi ZIP import 2023-06-15 23:21:40 +02:00
zadam 74400dad97 fix race condition between script execution and saving, closes #4028 2023-06-15 21:51:41 +02:00
zadam 1b68adf3e4 compatibility with online excalidraw tool 2023-06-15 21:34:42 +02:00
zadam a2cd6f92d7 compatibility with online excalidraw tool 2023-06-15 21:34:02 +02:00
zadam 3ff5fe61b2 unified file and image upload WIP 2023-06-15 01:26:38 +02:00
zadam 75c6afd1c3 fix loading of string content saved as binary 2023-06-14 22:21:22 +02:00
zadam 8d2958738f add option to hide the "Powered by CKEditor" banner 2023-06-14 00:51:05 +02:00
zadam 0496412f4a cleanup of unused options 2023-06-14 00:38:48 +02:00
zadam f80a20d18c don't use non-existing btn-xs 2023-06-14 00:31:15 +02:00
zadam 34c642a49a rename attachment 2023-06-14 00:28:59 +02:00
zadam 2ebbc33081 fix revision rename DB migration 2023-06-13 23:39:42 +02:00
zadam ac56056f65 Merge branch 'master' into next61
# Conflicts:
#	package-lock.json
#	src/routes/api/recent_changes.js
2023-06-13 23:25:35 +02:00
zadam 6f16b4caec Merge branch 'beta' 2023-06-13 23:24:09 +02:00
zadam bea39f37ee stop click propagation in tree item actions 2023-06-13 00:12:55 +02:00
mechanarchy 6548149107 Update etapi.js
(cherry picked from commit b97ebe9f03)
2023-06-12 23:21:38 +02:00
zadam fbc805a221 Merge pull request #4019 from mechanarchy/patch-2
Fix attempted ETAPI token rename after cancel
2023-06-12 23:21:13 +02:00
zadam 6015a067ec sql console outputs results of CTEs, fixes #2800 2023-06-12 23:18:57 +02:00
mechanarchy 4a1ecd906b Update entrypoints.js
(cherry picked from commit 08ec866dd2)
2023-06-12 23:13:40 +02:00
zadam 41844cf817 Merge pull request #4017 from mechanarchy/patch-1
Fix SQL Console error messages
2023-06-12 23:12:35 +02:00
zadam 004cfe1965 allow creating backups via ETAPI, #4014 2023-06-12 23:09:29 +02:00
mechanarchy b97ebe9f03 Update etapi.js 2023-06-10 17:36:23 +10:00
mechanarchy 08ec866dd2 Update entrypoints.js 2023-06-10 07:44:23 +10:00
zadam 2bdd538d7d release 0.60.2-beta v0.60.2-beta 2023-06-08 22:46:52 +02:00
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 0234ff5fca share support for attachment file download 2023-06-06 00:16:32 +02:00
zadam 44bcfd47c0 share support for attachment images 2023-06-05 23:05:05 +02:00
zadam 69c7eb14aa fixes 2023-06-05 21:14:33 +02:00
zadam 00453fc151 attachment ETAPI tests WIP 2023-06-05 17:00:58 +02:00
zadam 5c393f959d got rid of .isDeleted on froca entities (the property is not available there) 2023-06-05 16:26:05 +02:00
zadam e6bf6424e8 rename loadresults methods/properties for clarity that they don't contain entities, only rows 2023-06-05 16:12:02 +02:00
zadam 57702a07a2 attachment ETAPI support WIP 2023-06-05 09:44:36 +02:00
zadam 3b3f6082a7 attachment ETAPI support WIP 2023-06-05 09:23:42 +02:00
zadam 49241ab318 merge 2023-06-05 00:12:08 +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 fe908759d1 rename "note revision" to just "revision" 2023-06-04 23:02:49 +02:00
zadam 779751a234 rename "note revision" to just "revision" 2023-06-04 23:01:40 +02:00
zadam cb9feab7b2 got rid of the hot/cold blob, all blobs are "cold" now 2023-06-04 22:50:07 +02:00