automerge

ThetaDev/automerge

Fork 0

Commit graph

9ffb4624c1 Noop when deleteing a delete Orion Henry 2020-03-29 23:22:10 -0700
7e9b49f4bd Refactor the undo and diffs to be return args instead of pass by mut ref Orion Henry 2020-03-29 23:14:48 -0700
09f4e09030 fixed a bug where detached objects would error on diff generation Orion Henry 2020-03-29 22:55:26 -0700
319993cd6a add links Orion Henry 2020-03-29 18:35:39 -0700
6c0f21e47e elemids not properly deleting Orion Henry 2020-03-29 16:42:15 -0700
e24e073c10 code cleanup around diff generation Orion Henry 2020-03-29 15:58:24 -0700
853a5223b4 special case to serialize empty diffs Orion Henry 2020-03-29 13:11:39 -0700
1c92dc6d24 undo/redo Orion Henry 2020-03-29 10:12:55 -0700
8380c6a451 merge cleanup Orion Henry 2020-03-29 07:33:52 -0700
058a0f6b3e move op_handle into its own file Orion Henry 2020-03-28 23:42:01 -0700
7aa7ebe968 light cleanup Orion Henry 2020-03-28 22:44:11 -0700
bd338e9ee2 bug in the command compressing code Orion Henry 2020-03-28 21:33:42 -0700
d13a859039 light cleanup Orion Henry 2020-03-28 20:19:58 -0700
6e76450f5a error on set=null Orion Henry 2020-03-28 18:49:31 -0700
b9d003d13d bug in my element iterator Orion Henry 2020-03-28 18:34:06 -0700
45ecce648d some light cleanup Orion Henry 2020-03-28 16:02:58 -0700
9fa6ea8520 combile similar ops when generating a change Orion Henry 2020-03-28 15:48:31 -0700
5609c1a3e8 big operation refactor Orion Henry 2020-03-28 14:11:49 -0700
899feaefb1 simple refactor - apply_ops Orion Henry 2020-03-28 08:27:11 -0700
923b767d0a columner encoding Orion Henry 2020-03-27 08:15:57 -0700
1152b6006c break out ObjectID from OpID - implement table obj_id hack Orion Henry 2020-03-26 16:50:26 -0700
8ee72ba1e2 flatten out oprequest struct Orion Henry 2020-03-26 07:31:48 -0700
a0ece5c413 forgot to add helpers Orion Henry 2020-03-25 15:18:22 -0700
8139f83dfd fixed increment Orion Henry 2020-03-25 15:09:24 -0700
771c6bee18 all backend tests passing Orion Henry 2020-03-25 14:15:23 -0700
0a4e28a52d fix deps/pred/insert bugs Orion Henry 2020-03-25 13:13:36 -0700
d016278107 make child optional Orion Henry 2020-03-24 13:07:48 -0700
22f06f79c6 get_patch() works Orion Henry 2020-03-24 12:12:51 -0700
76491bc07d wip Orion Henry 2020-03-23 21:21:01 -0700
2e80b5b3a2 wip Orion Henry 2020-03-23 11:19:59 -0700
2aaeb4788c wip Orion Henry 2020-03-22 14:36:15 -0400
3ec6991b40 wip Orion Henry 2020-03-20 15:17:44 -0400
5ce3a177b1 wip Orion Henry 2020-03-19 14:14:08 -0400
7b866b98b9 wip - 7 tests passing Orion Henry 2020-03-17 12:59:08 -0400
ce21167174 wip Orion Henry 2020-03-16 15:12:27 -0400
52cdde1aed Merge branch 'master' into benchmarking Alex Good 2020-03-12 16:50:00 +0000
7ff7265637 Remove deploy from Travis setup Alex Good 2020-03-12 16:49:48 +0000
1cca17cf6b Fix clippy on rust beta Alex Good 2020-03-12 15:59:26 +0000
7b31b4e4f5 Run cargo fmt Alex Good 2020-03-12 15:30:01 +0000
f26da195a2 Add yarn build-release Alex Good 2020-03-12 15:29:22 +0000
4a22f95bf8 Merge branch 'master' into benchmarking Alex Good 2020-03-12 15:28:55 +0000
d007c0c7a7 Add benchmark Alex Good 2020-03-12 15:16:33 +0000
d25137875b dont dupe change v0.13.0 Orion Henry 2020-03-11 13:45:52 -0400
737576ef6c

Merge pull request #9 from alexjg/histories Orion Henry 2020-03-11 12:30:56 -0400
8f3e664d2d empty clock comment Orion Henry 2020-03-11 12:28:47 -0400
6e0933099f pr feedback cleanup Orion Henry 2020-03-11 12:19:27 -0400
9c5186b3d2 panic if wrong sized Orion Henry 2020-03-11 11:29:25 -0400
bae6c2fcb6 cleanup Orion Henry 2020-03-11 11:09:33 -0400
355f1cd5e2 fix transitive deps bug, refactor actor_histories, remove root_value Orion Henry 2020-03-11 11:04:43 -0400
aff1963538 clean up diverge logic Orion Henry 2020-03-05 20:14:28 -0500
1d068bee82 remove a bunch of copying in missing_deps Orion Henry 2020-03-05 19:52:51 -0500
d827474124 fmt Orion Henry 2020-03-05 19:38:07 -0500
00d00f56a9 cleanup Clock Orion Henry 2020-03-05 17:40:57 -0500
f663fa9fed update clock func name Orion Henry 2020-03-05 16:19:06 -0500
320e51bfd8 get_missing_changes rewrite Orion Henry 2020-03-05 15:04:29 -0500
5309b44194 lazy fork, op.cmp(fix) Orion Henry 2020-03-05 14:42:34 -0500
420e4e43d2 fix history test Orion Henry 2020-03-05 13:10:15 -0500
30a132f529 dont report 0 in deps Orion Henry 2020-03-05 11:53:13 -0500
f3070c0a8c get_missing_deps needs self.actor/seq too Orion Henry 2020-03-05 11:48:32 -0500
68048b801c diverge doc, less_or_equal fix Orion Henry 2020-03-05 11:20:12 -0500
021ba56464 Fix concurrent increment operations Alex Good 2020-03-05 15:43:53 +0000
79f49969f4 Fix ordering of concurrent inserts in lists Alex Good 2020-03-05 13:42:22 +0000
7a532e02f3 Fix tests, formatting, clippy Alex Good 2020-03-05 11:15:01 +0000
2164d6f0d8 lets leak memory!! Orion Henry 2020-03-04 22:31:16 -0500
41012d2853 undo/redo stack Orion Henry 2020-03-04 22:21:06 -0500
8e63bc798a fix undoable bug, transit-js bug Orion Henry 2020-03-04 20:54:49 -0500
0e6f3ab027 replace is_applied Orion Henry 2020-03-04 15:07:18 -0500
5ca6f9c9a8 is_applied fix Orion Henry 2020-03-04 14:31:47 -0500
662c0bbdb6 toJS on immutable objects Orion Henry 2020-03-04 12:41:03 -0500
08bc51ad28 Fix get_missing_changes Alex Good 2020-03-04 17:19:01 +0000
4a37cd70b9 dont GC state on merge Orion Henry 2020-03-04 12:17:25 -0500
1a3d3af655 adding history Orion Henry 2020-03-04 12:10:35 -0500
c96a5ff663 rustfmt Orion Henry 2020-03-04 10:17:13 -0500
cfd6018b90 use js wrapper Orion Henry 2020-03-04 10:06:49 -0500
ffa86bf205

Merge pull request #6 from alexjg/final-impls alexjg 2020-03-04 14:38:24 +0000
3d6a8607fd Add tweaks to WASm interface Alex Good 2020-03-04 14:38:50 +0000
2078a59e06 Merge branch 'master' into final-impls Alex Good 2020-03-02 12:05:25 +0000
ff79872af3 Run cargo fmt on tests too Alex Good 2020-03-02 12:05:11 +0000
10de85993b Merge branch 'master' into final-impls Alex Good 2020-03-02 12:03:50 +0000
2ef5d782e3 Run clippy on tests too Alex Good 2020-03-02 12:03:39 +0000
4467b0c5be More CI wrangling Alex Good 2020-03-02 11:55:14 +0000
e3e4b819d2 More CI wrangling Alex Good 2020-03-02 11:45:28 +0000
5cbaf355e2 Attempt fixing clippy for CI Alex Good 2020-03-02 11:42:06 +0000
2c2fb9704d Implement remaining methods on backend Alex Good 2020-03-02 11:35:51 +0000
aada808bc8 Run rustfmt and clippy Alex Good 2020-02-29 15:26:38 +0000
57a93e8db8 Consolidate ObjectState impls Alex Good 2020-02-29 15:21:03 +0000
8d4eccdf20 Reorder diffs in backend_test.js to reflect order of map iteration in rust Alex Good 2020-02-29 15:20:35 +0000
f9c6aa5073 Correctly support multiple undo/redo operations Alex Good 2020-02-29 14:59:03 +0000
78855be049 Run clippy Alex Good 2020-02-28 17:46:20 +0000
3fcf08480d Merge branch 'master' into undo Alex Good 2020-02-28 17:40:45 +0000
cdbb339920 Redo implemented Alex Good 2020-02-28 17:26:41 +0000
7118117dce

Merge pull request #4 from alexjg/getpatch alexjg 2020-02-28 16:50:45 +0000
9752c7d512 fix bug with list patch after numbers not counting for deleted fields Orion Henry 2020-02-28 11:45:43 -0500
84929b3620 Undo implemented Alex Good 2020-02-28 16:18:50 +0000
d15d6da00c code cleanup Orion Henry 2020-02-28 11:16:00 -0500
072010de6d rustfmt Orion Henry 2020-02-28 09:35:40 -0500
4e0d0c9ef3 WIP Alex Good 2020-02-28 13:51:05 +0000
2fbdc709af WIP Alex Good 2020-02-28 13:50:48 +0000
eb2a8aaee7 First stab at undo support Alex Good 2020-02-28 12:39:03 +0000
0fbae3ce81 all get_patch tests passing Orion Henry 2020-02-28 01:12:02 -0500