Andrew Jeffery 
								
							 
						 
						
							
							
								
							
							
	535d2eb92f  
						 
						
							
							
								
								
								Fix js proxy api  
							
							
							
							
						 
						
							2022-03-04 11:46:03 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	2fc0705907  
						 
						
							
							
								
								
								change MAP,LIST,TEXT to be {},[],'' - allow recursion  
							
							
							
							
						 
						
							2022-02-23 19:43:13 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	836e6ba510  
						 
						
							
							
								
								
								fix return types  
							
							
							
							
						 
						
							2022-01-31 17:21:16 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	cfa1067c19  
						 
						
							
							
								
								
								rework wasm function to use js types more directly  
							
							
							
							
						 
						
							2022-01-28 17:07:59 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	54fec3e438  
						 
						
							
							
								
								
								lamport compare was backward on actorids and so was value resolution  
							
							
							
							
						 
						
							2022-01-20 14:17:11 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	a12af10ee1  
						 
						
							
							
								
								
								optimize js  
							
							
							
							
						 
						
							2022-01-19 18:08:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	d50062b769  
						 
						
							
							
								
								
								move values into the counter type - remove need for vis_window  
							
							
							
							
						 
						
							2022-01-14 06:27:42 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	04c7e9184d  
						 
						
							
							
								
								
								port over all the sync tests to the wasm api  
							
							
							
							
						 
						
							2022-01-09 08:05:00 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	b67098d5e1  
						 
						
							
							
								
								
								convert automerge-js to use import/export  
							
							
							
							
						 
						
							2022-01-09 08:05:00 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	d2a7cc5f75  
						 
						
							
							
								
								
								get sync tests working  
							
							
							
							
						 
						
							2022-01-09 08:05:00 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	de5332af05  
						 
						
							
							
								
								
								Run the js_test in CI  
							
							... 
							
							
							
							
							We add a script for running the js tests in `scripts/ci/js_tests`. This
script can also be run locally. We move the `automerge-js` package to
below the `automerge-wasm` crate as it is specifically testing the wasm
interface. We also add an action to the github actions workflow for CI
to run the js tests. 
							
						 
						
							2021-12-30 17:30:38 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	9d0caab6b6  
						 
						
							
							
								
								
								import the uuid tests  
							
							
							
							
						 
						
							2021-12-22 15:36:57 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	4c90b5f822  
						 
						
							
							
								
								
								get js text tests working  
							
							
							
							
						 
						
							2021-12-22 15:08:31 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	780298b72c  
						 
						
							
							
								
								
								docs, tests, code cleanup  
							
							
							
							
						 
						
							2021-12-21 09:23:34 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	8eb147333c  
						 
						
							
							
								
								
								use value_at() in the js wrapper  
							
							
							
							
						 
						
							2021-12-21 09:23:34 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	fc89a26302  
						 
						
							
							
								
								
								first pass for sync in js/wasm  
							
							
							
							
						 
						
							2021-12-18 00:22:20 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	1739a7e7b1  
						 
						
							
							
								
								
								encode/decode sync in wasm  
							
							
							
							
						 
						
							2021-12-17 21:14:16 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	9c237c7f00  
						 
						
							
							
								
								
								remove expanded_op and internal_op_type  
							
							
							
							
						 
						
							2021-12-17 12:39:26 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	26ccaf63cc  
						 
						
							
							
								
								
								readme and new tests  
							
							
							
							
						 
						
							2021-12-15 19:07:39 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	89a2e4a0fa  
						 
						
							
							
								
								
								remove old seq_scan code  
							
							
							
							
						 
						
							2021-12-13 07:45:38 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	a1a7e42dfa  
						 
						
							
							
								
								
								remove begin - make tx implicit  
							
							
							
							
						 
						
							2021-12-12 12:51:27 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	670de06bdf  
						 
						
							
							
								
								
								rework op_set query system  
							
							
							
							
						 
						
							2021-12-10 15:35:51 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	70b482b827  
						 
						
							
							
								
								
								go faster  
							
							
							
							
						 
						
							2021-12-03 21:56:59 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	4fe61e42d4  
						 
						
							
							
								
								
								splice  
							
							
							
							
						 
						
							2021-11-30 11:29:51 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	8ffccd96bc  
						 
						
							
							
								
								
								cleanup and op_tree  
							
							
							
							
						 
						
							2021-11-29 19:08:32 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	a87fc3c1d3  
						 
						
							
							
								
								
								profiling and seq_tree  
							
							
							
							
						 
						
							2021-11-29 17:27:47 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	73991a9469  
						 
						
							
							
								
								
								text first pass  
							
							
							
							
						 
						
							2021-11-28 08:04:30 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	e76a3e4ae9  
						 
						
							
							
								
								
								fix tx actorid bug  
							
							
							
							
						 
						
							2021-11-27 18:45:32 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	c3328997a6  
						 
						
							
							
								
								
								inc()  
							
							
							
							
						 
						
							2021-11-26 21:26:35 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	6a5aa75c78  
						 
						
							
							
								
								
								move set is insert behavior out of backend  
							
							
							
							
						 
						
							2021-11-19 21:52:54 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	f1f2129384  
						 
						
							
							
								
								
								code cleanup  
							
							
							
							
						 
						
							2021-11-19 21:33:41 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	288f214964  
						 
						
							
							
								
								
								start on encode/decode  
							
							
							
							
						 
						
							2021-11-19 14:44:20 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	c1d33386bf  
						 
						
							
							
								
								
								out of order changes handled  
							
							
							
							
						 
						
							2021-11-19 11:43:37 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	c7f43aff82  
						 
						
							
							
								
								
								numeric indexes  
							
							
							
							
						 
						
							2021-11-19 11:15:22 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	a0b8a6cfe3  
						 
						
							
							
								
								
								load()  
							
							
							
							
						 
						
							2021-11-17 15:59:23 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	efce75558e  
						 
						
							
							
								
								
								rework the api to be set(), insert(), inc(), del()  
							
							
							
							
						 
						
							2021-11-17 13:27:52 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	e4bffe9ddc  
						 
						
							
							
								
								
								108/123 tests passing  
							
							
							
							
						 
						
							2021-11-16 18:35:21 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	8f3ac5a626  
						 
						
							
							
								
								
								fix merge bug  
							
							
							
							
						 
						
							2021-11-16 18:09:49 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	8a980d5340  
						 
						
							
							
								
								
								list tests passing  
							
							
							
							
						 
						
							2021-11-16 16:12:50 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	5f6524d216  
						 
						
							
							
								
								
								conflicted obj/list  
							
							
							
							
						 
						
							2021-11-13 08:46:09 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	d396cd17eb  
						 
						
							
							
								
								
								more tests passing  
							
							
							
							
						 
						
							2021-11-13 00:04:43 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	94f6855390  
						 
						
							
							
								
								
								make in lists  
							
							
							
							
						 
						
							2021-11-12 23:48:31 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	b2f7fc9f93  
						 
						
							
							
								
								
								ignore updates / w conflicts  
							
							
							
							
						 
						
							2021-11-12 17:39:05 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	112a5bc8f1  
						 
						
							
							
								
								
								getConflicts, getHistory  
							
							
							
							
						 
						
							2021-11-12 16:03:57 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	cde3ac95f1  
						 
						
							
							
								
								
								more tests  
							
							
							
							
						 
						
							2021-11-12 12:39:18 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	ab5565481e  
						 
						
							
							
								
								
								applyChanges  
							
							
							
							
						 
						
							2021-11-11 18:40:19 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	8fe90456cb  
						 
						
							
							
								
								
								list update working  
							
							
							
							
						 
						
							2021-10-29 18:40:12 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	fb593a974e  
						 
						
							
							
								
								
								lists part1  
							
							
							
							
						 
						
							2021-10-18 20:53:08 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	4ac25ee700  
						 
						
							
							
								
								
								more tests  
							
							
							
							
						 
						
							2021-10-15 10:01:11 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	a0693ffac2  
						 
						
							
							
								
								
								more legacy tests  
							
							
							
							
						 
						
							2021-10-14 10:59:51 -04:00