ThetaDev/automerge
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Commit graph

  • 1739a7e7b1 encode/decode sync in wasm Orion Henry 2021-12-17 21:14:16 -0500
  • ed6975d7ee Make a rust workspace Andrew Jeffery 2021-12-17 23:41:34 +0000
  • a0f9612be9 Fixup readme and add makefile Andrew Jeffery 2021-12-17 23:37:21 +0000
  • c5f6ffc4cd Fix wasm build Andrew Jeffery 2021-12-17 23:36:38 +0000
  • 9c237c7f00 remove expanded_op and internal_op_type Orion Henry 2021-12-17 12:39:26 -0500
  • 702117b996 move change_hash out of legacy, removing diff Orion Henry 2021-12-17 11:44:36 -0500
  • 90244236c3 move important items out of legacy Orion Henry 2021-12-17 11:33:05 -0500
  • 6b517b9894 move things we need out of legacy Orion Henry 2021-12-17 11:00:56 -0500
  • b2f339e714 update packages - get legacy tests passing Orion Henry 2021-12-17 10:36:02 -0500
  • 4c83416abf cheers to andrew who found a faster B value on the tree Orion Henry 2021-12-17 10:19:15 -0500
  • 0ac2407815 cargo fmt Orion Henry 2021-12-17 09:52:44 -0500
  • a2191e2643 Add nix config Andrew Jeffery 2021-12-17 11:07:28 +0000
  • db3a43c5b6 import protocol into legacy Orion Henry 2021-12-16 20:39:08 -0500
  • 0c417f02b2 Improve ergonomics of the main API Andrew Jeffery 2021-12-16 10:03:11 +0000
  • e0a4ab3ea2 Improve ergonomics of the main API Andrew Jeffery 2021-12-16 10:03:11 +0000
  • 1bd54d5489 Optimise last function on op_tree Andrew Jeffery 2021-12-16 09:44:09 +0000
  • 54b02095fe Fix automerge-protocol dependency to use git Andrew Jeffery 2021-12-16 09:41:34 +0000
  • 26ccaf63cc readme and new tests Orion Henry 2021-12-15 19:07:39 -0500
  • 52412ee75a update mocha Orion Henry 2021-12-15 12:26:21 -0500
  • 0c284992cd stub out text_at Orion Henry 2021-12-13 10:52:06 -0500
  • 850db4a35b objid vs opid was not useful as an external type Orion Henry 2021-12-13 10:45:43 -0500
  • 0c96d504bc getting ready for at(clock) api Orion Henry 2021-12-13 10:28:49 -0500
  • f31fa308b3 add len query - remove obj specific code from tree Orion Henry 2021-12-13 10:12:40 -0500
  • d99d0dbf47 cleanup value Orion Henry 2021-12-13 09:55:31 -0500
  • 0f9115c54f cleaned up edit trace, added docs Orion Henry 2021-12-13 09:20:49 -0500
  • 89a2e4a0fa remove old seq_scan code Orion Henry 2021-12-13 07:45:38 -0500
  • a1a7e42dfa remove begin - make tx implicit Orion Henry 2021-12-12 12:51:27 -0800
  • 406a20707f seek_op, inc test, logging Orion Henry 2021-12-12 09:27:40 -0800
  • e2b63ca102 adding text() and splice_text() Orion Henry 2021-12-10 15:20:19 -0800
  • 670de06bdf rework op_set query system Orion Henry 2021-12-10 08:54:51 -0500
  • 09f073d902 refactor query system - wip Orion Henry 2021-12-09 23:23:23 -0500
  • 3ba7e2fb7f make length fast - fix bug in index Orion Henry 2021-12-07 15:00:21 -0500
  • bbfb2337d5 save_incremental() Orion Henry 2021-12-06 13:01:27 -0500
  • 0cc815ef74 move query logic into trait, format Orion Henry 2021-12-06 10:01:50 -0500
  • 70b482b827 go faster Orion Henry 2021-12-03 21:56:59 -0800
  • 4fe61e42d4 splice Orion Henry 2021-11-30 11:26:29 -0800
  • 8ffccd96bc cleanup and op_tree Orion Henry 2021-11-29 19:08:32 -0800
  • a87fc3c1d3 profiling and seq_tree Orion Henry 2021-11-29 17:27:47 -0700
  • 88361b6915 remove iter_mut Orion Henry 2021-11-29 11:26:43 -0700
  • c51a0073ae cleanup Orion Henry 2021-11-29 11:08:37 -0700
  • 2191f6a723 iter Orion Henry 2021-11-28 20:04:44 -0700
  • 7a159e293c wasm-opt isnt supported on this platform Orion Henry 2021-11-28 10:09:26 -0700
  • 73991a9469 text first pass Orion Henry 2021-11-28 08:04:30 -0700
  • e76a3e4ae9 fix tx actorid bug Orion Henry 2021-11-27 18:45:32 -0700
  • c3328997a6 inc() Orion Henry 2021-11-26 21:26:35 -0500
  • a4c04247eb simple cleanup Orion Henry 2021-11-26 12:01:41 -0500
  • 6a5aa75c78 move set is insert behavior out of backend Orion Henry 2021-11-19 21:52:54 -0500
  • f1f2129384 code cleanup Orion Henry 2021-11-19 21:20:56 -0500
  • 288f214964 start on encode/decode Orion Henry 2021-11-19 14:43:02 -0500
  • c1d33386bf out of order changes handled Orion Henry 2021-11-19 11:43:37 -0500
  • c7f43aff82 numeric indexes Orion Henry 2021-11-19 11:14:15 -0500
  • a0b8a6cfe3 load() Orion Henry 2021-11-17 15:59:23 -0500
  • efce75558e rework the api to be set(), insert(), inc(), del() Orion Henry 2021-11-17 00:54:54 -0500
  • e4bffe9ddc 108/123 tests passing Orion Henry 2021-11-16 18:35:21 -0500
  • 8f3ac5a626 fix merge bug Orion Henry 2021-11-16 18:09:49 -0500
  • 8a980d5340 list tests passing Orion Henry 2021-11-16 16:12:50 -0500
  • cf2a5125a1
         Fix logic for condensing insert ops (#242) alexjg 2021-11-15 22:28:00 +0000
  • 5f6524d216 conflicted obj/list Orion Henry 2021-11-13 08:46:09 -0500
  • d396cd17eb more tests passing Orion Henry 2021-11-12 23:53:01 -0500
  • 94f6855390 make in lists Orion Henry 2021-11-12 23:48:31 -0500
  • b2f7fc9f93 ignore updates / w conflicts Orion Henry 2021-11-12 17:39:05 -0500
  • 112a5bc8f1 getConflicts, getHistory Orion Henry 2021-11-12 16:03:57 -0500
  • a28d4b2f0c adding sync Orion Henry 2021-11-12 13:12:57 -0500
  • cde3ac95f1 more tests Orion Henry 2021-11-12 12:39:18 -0500
  • 91800f7035 Fix logic for condensing insert ops Alex Good 2021-11-11 18:50:48 +0000
  • ab5565481e applyChanges Orion Henry 2021-11-11 18:40:19 -0500
  • 40007ffa33 implement rollback Orion Henry 2021-11-10 10:54:02 -0500
  • e7119e61f7 optype simplify Orion Henry 2021-11-09 18:22:11 -0500
  • 610ddef016 code cleanup Orion Henry 2021-11-09 17:46:10 -0500
  • db4456497f cleanup Orion Henry 2021-11-08 12:56:32 -0500
  • 173aa8b97b progress on bin change import export Orion Henry 2021-11-07 15:37:03 -0500
  • 2b9a0dbddc wip Orion Henry 2021-11-02 11:36:03 -0400
  • f5fb305db4 encoding wip Orion Henry 2021-10-31 09:04:01 -0400
  • 8fe90456cb list update working Orion Henry 2021-10-25 10:18:46 -0400
  • fb593a974e lists part1 Orion Henry 2021-10-18 12:25:54 -0400
  • e72571962b
         Correctly sort actor IDs when encoding changes (#241) alexjg 2021-10-17 11:58:15 +0100
  • ceea97229c Correctly sort actor IDs when encoding changes Alex Good 2021-10-14 19:30:21 +0100
  • 4ac25ee700 more tests Orion Henry 2021-10-15 10:01:11 -0400
  • 18dc7b9ae0 bugfix Orion Henry 2021-10-14 11:02:52 -0400
  • a0693ffac2 more legacy tests Orion Henry 2021-10-14 10:59:51 -0400
  • 9a421f1f79
         Update interop tests to automerge 1.0.1-preview.5 Alex Good 2021-10-14 13:40:16 +0100
  • fcb30c27c9
         Fix the -o parameter of automerge export Alex Good 2021-10-14 12:24:58 +0100
  • e682ac62ea
         Add a merge command to the CLI (#239) alexjg 2021-10-14 12:00:30 +0100
  • c007603212
         Add a merge command to the CLI Alex Good 2021-10-13 12:35:34 +0100
  • 15209cedf9 first two legacy tests passing Orion Henry 2021-10-12 07:30:44 -0400
  • d279819bfc Update to rand 0.8 Alex Good 2021-10-11 19:48:33 +0100
  • 6c6c5293f9 bugfix - naked float Orion Henry 2021-10-11 12:37:01 -0400
  • fdf389974c all types (except cursors) working Orion Henry 2021-10-11 12:34:12 -0400
  • ba32c07fc4 Fixup apply_local_change doc link Andrew Jeffery 2021-10-10 16:51:56 +0100
  • 9baf384e80 Add builder for Automerge to use existing fe and be Andrew Jeffery 2021-10-10 16:51:41 +0100
  • 0243b42c0c
         Combined frontend and backend interface (#238) Andrew Jeffery 2021-10-09 18:06:39 +0100
  • 5516cfa23a Add documentation for the combined interface Andrew Jeffery 2021-10-08 18:36:22 +0100
  • 5369aa8b6d Add sync functionality and some basic tests Andrew Jeffery 2021-10-08 18:23:43 +0100
  • ef6af506b5 Add combined frontend and backend interface Andrew Jeffery 2021-10-08 17:57:11 +0100
  • 830d9c36e9 We add ChangeHash to the exports of automerge Alex Good 2021-10-09 14:22:26 +0100
  • 8fe614f0a0 bytes Orion Henry 2021-09-30 12:29:36 -0400
  • c25aae32e4 null counter timestamp Orion Henry 2021-09-30 12:13:08 -0400
  • 3ad95dce23 map pred/succ works Orion Henry 2021-09-30 11:43:14 -0400
  • 1d6733d94a toJS subobjects Orion Henry 2021-09-29 13:08:28 -0400
  • c4e022d5ed wip Orion Henry 2021-09-24 16:12:09 -0400