zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							d475346a09
							
						
					 | 
					
						
						
							
							renamed attachment's parentId to more fitting ownerId
						
						
						
						
						
						
					 | 
					
						2023-07-14 17:01:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac9a4b3afc
							
						
					 | 
					
						
						
							
							fixes in etapi tests
						
						
						
						
						
						
					 | 
					
						2023-07-10 19:10:07 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							3223e76787
							
						
					 | 
					
						
						
							
							etapi ZIP import
						
						
						
						
						
						
					 | 
					
						2023-06-15 23:21:40 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							004cfe1965
							
						
					 | 
					
						
						
							
							allow creating backups via ETAPI, #4014
						
						
						
						
						
						
					 | 
					
						2023-06-12 23:09:29 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							57702a07a2
							
						
					 | 
					
						
						
							
							attachment ETAPI support WIP
						
						
						
						
						
						
					 | 
					
						2023-06-05 09:44:36 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e47c3a27b0
							
						
					 | 
					
						
						
							
							remove the workaround test
						
						
						
						
						
						
					 | 
					
						2023-06-01 23:18:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mm21
							
						 
					 | 
					
						
						
						
						
							
						
						
							86a080e7ec
							
						
					 | 
					
						
						
							
							Add ETAPI test to repro inherited attribute issue for cloned note #3994
						
						
						
						
						
						
					 | 
					
						2023-06-01 17:20:11 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5cfc28912
							
						
					 | 
					
						
						
							
							rename inheritableAttributeCache to __inheritableAttributeCache for consistency
						
						
						
						
						
						
					 | 
					
						2023-05-31 23:21:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mm21
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e5a02094c
							
						
					 | 
					
						
						
							
							Add ETAPI tests to repro inherited attribute issue and workaround
						
						
						
						
						
						
					 | 
					
						2023-05-31 17:11:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bdfdc0402d
							
						
					 | 
					
						
						
							
							update content should parse out links #3509
						
						
						
						
						
						
					 | 
					
						2023-01-11 23:22:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb8496cb3f
							
						
					 | 
					
						
						
							
							ETAPI method to create note revision, #3509
						
						
						
						
						
						
					 | 
					
						2023-01-11 23:18:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							724f99f17c
							
						
					 | 
					
						
						
							
							add prefix "_" to "named" IDs
						
						
						
						
						
						
					 | 
					
						2022-12-21 16:11:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e07c08043
							
						
					 | 
					
						
						
							
							basic auth etapi should require "etapi" username
						
						
						
						
						
						
					 | 
					
						2022-10-09 21:33:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e4a9f63fa
							
						
					 | 
					
						
						
							
							support basic auth in ETAPI
						
						
						
						
						
						
					 | 
					
						2022-10-08 20:59:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Hynes
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a6ead6d86
							
						
					 | 
					
						
						
							
							fix a couple of api shortcomings
						
						
						
						
						
						
						
						* add note content to openapi spec file
* add test for get note content api endpoint 
						
						
					 | 
					
						2022-09-16 13:18:01 +10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							80887fd3c1
							
						
					 | 
					
						
						
							
							export notes via ETAPI, #3012
						
						
						
						
						
						
					 | 
					
						2022-07-24 21:30:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							17dd6141fb
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/stable'
						
						
						
						
						
						
						
						# Conflicts:
#	Dockerfile
#	package-lock.json
#	package.json
#	src/services/cloning.js 
						
						
					 | 
					
						2022-03-22 21:04:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							eba824a5b1
							
						
					 | 
					
						
						
							
							added app-info method to etapi #2697
						
						
						
						
						
						
					 | 
					
						2022-03-07 22:57:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f33791922
							
						
					 | 
					
						
						
							
							fix uploading binary data through ETAPI, closes #2667
						
						
						
						
						
						
					 | 
					
						2022-02-18 22:34:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							2248d98cc7
							
						
					 | 
					
						
						
							
							using 201 for created entities in etapi
						
						
						
						
						
						
					 | 
					
						2022-01-12 21:14:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							28df5d4aa2
							
						
					 | 
					
						
						
							
							etapi improvements and more tests
						
						
						
						
						
						
					 | 
					
						2022-01-12 19:32:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							91dec23d5e
							
						
					 | 
					
						
						
							
							ETAPI auth, spec improvements etc.
						
						
						
						
						
						
					 | 
					
						2022-01-10 17:09:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c33bc7e12c
							
						
					 | 
					
						
						
							
							ETAPI search endpoint
						
						
						
						
						
						
					 | 
					
						2022-01-08 13:18:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5366abf75
							
						
					 | 
					
						
						
							
							ETAPI put content
						
						
						
						
						
						
					 | 
					
						2022-01-08 12:01:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ee1c9f3da
							
						
					 | 
					
						
						
							
							ETAPI delete/patch, refactoring
						
						
						
						
						
						
					 | 
					
						2022-01-07 19:33:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							82b2871a08
							
						
					 | 
					
						
						
							
							added date services to ETAPI
						
						
						
						
						
						
					 | 
					
						2022-01-05 19:25:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3114e0602
							
						
					 | 
					
						
						
							
							etapi fixes + basic test
						
						
						
						
						
						
					 | 
					
						2022-01-04 23:00:59 +01:00 | 
					
					
						
						
							
							
							
						
					 |