zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce39d3b4ce
							
						
					 | 
					
						
						
							
							Merge branch 'stable'
						
						
						
						
						
						
						
						# Conflicts:
#	docs/backend_api/BNote.html
#	docs/backend_api/BackendScriptApi.html
#	docs/backend_api/services_backend_script_api.js.html
#	docs/frontend_api/FAttribute.html
#	docs/frontend_api/FBranch.html
#	docs/frontend_api/FNote.html
#	docs/frontend_api/FrontendScriptApi.html
#	docs/frontend_api/entities_fattachment.js.html
#	docs/frontend_api/entities_fattribute.js.html
#	docs/frontend_api/entities_fblob.js.html
#	docs/frontend_api/entities_fbranch.js.html
#	docs/frontend_api/entities_fnote.js.html
#	docs/frontend_api/global.html
#	docs/frontend_api/index.html
#	docs/frontend_api/services_frontend_script_api.js.html
#	package.json
#	src/services/backend_script_api.js
#	src/services/build.js 
						
						
					 | 
					
						2023-11-21 20:46:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							88067c071c
							
						
					 | 
					
						
						
							
							add api.backupNow() to backend API, closes #4455
						
						
						
						
						
						
					 | 
					
						2023-11-20 23:14:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							6dd466ddaf
							
						
					 | 
					
						
						
							
							updates
						
						
						
						
						
						
					 | 
					
						2023-11-03 12:23:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc20d17bd2
							
						
					 | 
					
						
						
							
							npm upgrades && docs
						
						
						
						
						
						
					 | 
					
						2023-10-24 00:13:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a172d8bc1
							
						
					 | 
					
						
						
							
							add api.runOutsideOfSync() to backend script API, #4327
						
						
						
						
						
						
					 | 
					
						2023-10-19 00:29:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							00f5924251
							
						
					 | 
					
						
						
							
							jsdocs
						
						
						
						
						
						
					 | 
					
						2023-10-07 20:57:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							964abf390b
							
						
					 | 
					
						
						
							
							API docs
						
						
						
						
						
						
					 | 
					
						2023-09-25 23:11:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							602b9ae64a
							
						
					 | 
					
						
						
							
							API docs
						
						
						
						
						
						
					 | 
					
						2023-09-23 00:04:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8070c00b5f
							
						
					 | 
					
						
						
							
							API docs
						
						
						
						
						
						
					 | 
					
						2023-09-06 23:05:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zack Rauen
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5aea26960
							
						
					 | 
					
						
						
							
							Update API Docs
						
						
						
						
						
						
					 | 
					
						2023-08-21 04:18:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							8edb5428e5
							
						
					 | 
					
						
						
							
							small sync fixes and refactorings
						
						
						
						
						
						
					 | 
					
						2023-07-27 23:22:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							48f03f7a1b
							
						
					 | 
					
						
						
							
							API docs
						
						
						
						
						
						
					 | 
					
						2023-07-15 12:07:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							faa402fcda
							
						
					 | 
					
						
						
							
							API docs
						
						
						
						
						
						
					 | 
					
						2023-06-29 20:54:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9dae7823f
							
						
					 | 
					
						
						
							
							script api docs
						
						
						
						
						
						
					 | 
					
						2023-05-31 14:00:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							760c7b73ad
							
						
					 | 
					
						
						
							
							api docs
						
						
						
						
						
						
					 | 
					
						2023-02-17 16:30:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5ab6fa2fa
							
						
					 | 
					
						
						
							
							jsdoc fixes to make export simpler
						
						
						
						
						
						
					 | 
					
						2023-01-03 14:31:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zadam
							
						 
					 | 
					
						
						
						
						
							
						
						
							b80bf0ffb6
							
						
					 | 
					
						
						
							
							docs updated
						
						
						
						
						
						
					 | 
					
						2023-01-03 13:54:27 +01:00 | 
					
					
						
						
							
							
							
						
					 |