zadam
							
						 
					 | 
					
						
						
							
						
						df85a5eee4
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	src/routes/api/revisions.js
#	src/services/bulk_actions.js 
						
						
					 | 
					
						2023-12-11 23:07:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						0ac397e7ff
					 | 
					
						
						
							
							fix setNoteToParent API breakage, closes #4505
						
						
						
						
						
						
					 | 
					
						2023-12-11 23:05:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						cf99345962
					 | 
					
						
						
							
							use .js extension for require() as a preparation for future migration to ESM
						
						
						
						
						
						
					 | 
					
						2023-11-22 19:34:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						746abb02d3
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json
#	src/services/build.js 
						
						
					 | 
					
						2023-11-16 23:57:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						426a8f75aa
					 | 
					
						
						
							
							fix creating tree cycle by moving clone into another clone, closes #4442
						
						
						
						
						
						
					 | 
					
						2023-11-16 23:31:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						984bd726e9
					 | 
					
						
						
							
							add support for "bottom" sort, closes #4277
						
						
						
						
						
						
					 | 
					
						2023-09-25 23:25:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						c1865f8564
					 | 
					
						
						
							
							small refactor
						
						
						
						
						
						
					 | 
					
						2023-08-17 09:09:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						e8b52f9e6c
					 | 
					
						
						
							
							sync fixes and refactorings
						
						
						
						
						
						
					 | 
					
						2023-07-29 23:25:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						192e399cb5
					 | 
					
						
						
							
							typos
						
						
						
						
						
						
					 | 
					
						2023-06-30 11:18:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3b3f6082a7
					 | 
					
						
						
							
							attachment ETAPI support WIP
						
						
						
						
						
						
					 | 
					
						2023-06-05 09:23:42 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						9b32d86f78
					 | 
					
						
						
							
							take branch prefix into account while sorting, fixes #3896
						
						
						
						
						
						
					 | 
					
						2023-05-03 23:42:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kara
							
						 
					 | 
					
						
						
							
						
						53c87f3d25
					 | 
					
						
						
							
							Return created/existing branch in EnsureNoteIsPresentInParent
						
						
						
						
						
						
					 | 
					
						2023-05-01 12:41:22 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						f01657e1dd
					 | 
					
						
						
							
							refactorings
						
						
						
						
						
						
					 | 
					
						2023-04-14 16:49:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nriver
							
						 
					 | 
					
						
						
							
						
						93ad83d2ae
					 | 
					
						
						
							
							add #sortLocale label for natural sort. rephrase feature description.
						
						
						
						
						
						
					 | 
					
						2023-03-30 11:06:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nriver
							
						 
					 | 
					
						
						
							
						
						d3ec9f022c
					 | 
					
						
						
							
							add natural sort for notes, introduce new label #sortNatural
						
						
						
						
						
						
					 | 
					
						2023-03-10 14:35:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						f50a9c250a
					 | 
					
						
						
							
							many small issues found by intellij analysis
						
						
						
						
						
						
					 | 
					
						2023-01-15 21:04:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						d7cae7d5bb
					 | 
					
						
						
							
							improvements in API docs generation
						
						
						
						
						
						
					 | 
					
						2023-01-05 23:38:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						bff7434921
					 | 
					
						
						
							
							rename becca entities to have B-prefix, #3476
						
						
						
						
						
						
					 | 
					
						2023-01-03 13:52:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						c5fb2cccd5
					 | 
					
						
						
							
							fix bookmark's ID
						
						
						
						
						
						
					 | 
					
						2022-12-24 12:26:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5c4db266a4
					 | 
					
						
						
							
							code should not rely on fixed branch IDs since they can change after move
						
						
						
						
						
						
					 | 
					
						2022-12-23 20:40:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						724f99f17c
					 | 
					
						
						
							
							add prefix "_" to "named" IDs
						
						
						
						
						
						
					 | 
					
						2022-12-21 16:11:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						4026c2be4f
					 | 
					
						
						
							
							Merge branch 'next58'
						
						
						
						
						
						
						
						# Conflicts:
#	src/public/app/widgets/note_tree.js
#	src/services/tree.js 
						
						
					 | 
					
						2022-12-14 23:48:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						31b3af4129
					 | 
					
						
						
							
							label update should trigger parent resort, fixes #3366
						
						
						
						
						
						
					 | 
					
						2022-12-14 23:44:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5fc9f5f3f9
					 | 
					
						
						
							
							improvements
						
						
						
						
						
						
					 | 
					
						2022-12-06 23:48:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						27ce273d29
					 | 
					
						
						
							
							bookmarks use cloning
						
						
						
						
						
						
					 | 
					
						2022-12-04 13:16:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1a6c9be065
					 | 
					
						
						
							
							renamed shortcuts to launchers
						
						
						
						
						
						
					 | 
					
						2022-12-01 10:16:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						e4f57ab2fe
					 | 
					
						
						
							
							fix path resolution bug when path is outside of hosted subtree
						
						
						
						
						
						
					 | 
					
						2022-11-27 15:50:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						6a9ac6f90a
					 | 
					
						
						
							
							shortcuts improvements
						
						
						
						
						
						
					 | 
					
						2022-11-26 14:57:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3c1f826ead
					 | 
					
						
						
							
							add support for the persistent #sortDirection and #sortFoldersFirst (one time UI action exists), closes #3046
						
						
						
						
						
						
					 | 
					
						2022-09-04 13:59:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						2694bcff67
					 | 
					
						
						
							
							launchbar WIP
						
						
						
						
						
						
					 | 
					
						2022-08-08 23:13:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						616e2c1c29
					 | 
					
						
						
							
							add support for the persistent #sortDirection and #sortFoldersFirst (one time UI action exists), closes #3046
						
						
						
						
						
						
					 | 
					
						2022-08-07 23:51:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1b54596c5e
					 | 
					
						
						
							
							tweaks to handling of branch removal
						
						
						
						
						
						
					 | 
					
						2022-01-31 22:09:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						da4f26d7ce
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
					 | 
					
						2022-01-13 20:32:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						fa2ffd7574
					 | 
					
						
						
							
							ignore "Sync not configured" message when toggling shared state
						
						
						
						
						
						
					 | 
					
						2022-01-13 20:22:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						28df5d4aa2
					 | 
					
						
						
							
							etapi improvements and more tests
						
						
						
						
						
						
					 | 
					
						2022-01-12 19:32:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						47845930f4
					 | 
					
						
						
							
							sharing improvements
						
						
						
						
						
						
					 | 
					
						2021-12-23 20:54:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3860028a9e
					 | 
					
						
						
							
							sharing WIP
						
						
						
						
						
						
					 | 
					
						2021-12-20 17:30:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						211ff90ee8
					 | 
					
						
						
							
							add "top" label to keep notes on top, allow sorting by label, #2343
						
						
						
						
						
						
					 | 
					
						2021-11-23 23:09:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						5cfd1c030d
					 | 
					
						
						
							
							allow specifiyng sorted attribute (including off for overriding), #2142
						
						
						
						
						
						
					 | 
					
						2021-09-03 22:33:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						b660238a40
					 | 
					
						
						
							
							backend import unification
						
						
						
						
						
						
					 | 
					
						2021-06-29 22:15:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						439ef4a8cb
					 | 
					
						
						
							
							moved becca to top level source dir
						
						
						
						
						
						
					 | 
					
						2021-05-17 22:09:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						8417d4a4ea
					 | 
					
						
						
							
							various becca migration fixes
						
						
						
						
						
						
					 | 
					
						2021-05-11 22:00:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						3091119893
					 | 
					
						
						
							
							becca conversion WIP
						
						
						
						
						
						
					 | 
					
						2021-05-02 21:34:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						c035627f0a
					 | 
					
						
						
							
							use .markAsDeleted() instead of setting .isDeleted manually
						
						
						
						
						
						
					 | 
					
						2021-05-02 20:32:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						1af10d48a2
					 | 
					
						
						
							
							becca conversion WIP
						
						
						
						
						
						
					 | 
					
						2021-05-02 11:23:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						42510fda5c
					 | 
					
						
						
							
							renamed also cache files/modules
						
						
						
						
						
						
					 | 
					
						2021-04-16 23:01:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						f7e86c5be0
					 | 
					
						
						
							
							renamed noteCache into becca
						
						
						
						
						
						
					 | 
					
						2021-04-16 23:00:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
							
						
						b89ea9a684
					 | 
					
						
						
							
							check for note cache branch existence, #1808
						
						
						
						
						
						
					 | 
					
						2021-03-31 22:35:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |