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

Commit graph

  • 9e71736b88 Fixup after rebase Andrew Jeffery 2022-03-21 14:05:15 +0000
  • 12a4987ce7 Use prop rather than exposing legacy::Key Andrew Jeffery 2022-03-11 12:44:10 +0000
  • aeadedd584 Add watch example Andrew Jeffery 2022-03-11 11:20:48 +0000
  • dcc6c68485 Add parent's id to the op tree Andrew Jeffery 2022-03-11 11:18:08 +0000
  • 0f2bd3fb27 Make edit-trace vals be a string and use splice_text Andrew Jeffery 2022-04-07 12:20:54 +0100
  • 9fe8447d21 loadDoc -> load() and forkAt() Orion Henry 2022-04-07 01:19:27 -0400
  • d65280518d
         Merge pull request #329 from jeffa5/experiment-treequery-ref Andrew Jeffery 2022-04-06 03:06:39 -0500
  • 53f6904ae5 Add to_owned method to get a static value Andrew Jeffery 2022-04-04 21:13:09 +0100
  • 330aebb44a Make wasm ScalarValue take a cow Andrew Jeffery 2022-04-04 21:04:23 +0100
  • 17acab25b5 fix _obj notation Orion Henry 2022-03-17 13:50:38 -0400
  • 0d83f5f595 decorate Orion Henry 2022-03-17 13:00:22 -0400
  • 777a516051 spelling/grammar Orion Henry 2022-03-17 12:56:57 -0400
  • 4edb034a64 adding readme tests Orion Henry 2022-03-17 12:50:31 -0400
  • 3737ad316b spelling Orion Henry 2022-03-16 18:42:55 -0400
  • 051a0bbb54 early draft of the readme Orion Henry 2022-03-16 18:34:30 -0400
  • 83c08344e7 wip2 Orion Henry 2022-03-16 14:07:45 -0400
  • d8c126d1bc wip Orion Henry 2022-03-14 12:08:03 -0400
  • 545807cf74 Have historic versions clone the value again Andrew Jeffery 2022-04-04 13:06:36 +0100
  • fa2971a29a Have value be a reference for scalars Andrew Jeffery 2022-04-04 12:47:08 +0100
  • a2d4b2a778 Use ref on seek_op Andrew Jeffery 2022-04-04 11:58:37 +0100
  • 48ce85dbfb Add ref to treequery to allow borrowing ops Andrew Jeffery 2022-04-04 11:55:22 +0100
  • 8f4562b2cb Have apply_changes take an iterator Andrew Jeffery 2022-04-01 23:02:56 +0100
  • b54075fe4d Add makefile to run edit-traces Andrew Jeffery 2022-04-01 13:56:15 +0100
  • 6494945a42
         Merge pull request #327 from jeffa5/experiment-del-inc-names Andrew Jeffery 2022-04-01 07:47:13 -0500
  • d331ceb6d4 Rename set to put and set_object to put_object Andrew Jeffery 2022-04-01 12:38:03 +0100
  • 5cbc977076 More internal renames of del and inc Andrew Jeffery 2022-04-01 11:52:14 +0100
  • 632857a4e6 Rename del and inc in wasm and js Andrew Jeffery 2022-04-01 11:42:38 +0100
  • 1a66dc7ab1 Use full names for delete and increment Andrew Jeffery 2022-04-01 11:39:51 +0100
  • 790423c7ae
         Merge pull request #328 from jeffa5/experiment-js-names Andrew Jeffery 2022-04-01 07:34:20 -0500
  • 3631ddfd55 Fix js side Andrew Jeffery 2022-04-01 11:48:04 +0100
  • 0c16dfe2aa Change js function names to camelCase Andrew Jeffery 2022-04-01 11:46:43 +0100
  • 35ddda5e0f
         Merge pull request #324 from jeffa5/experiment-remove-const-b Andrew Jeffery 2022-03-31 08:14:25 -0500
  • 0e457d5891 Remove const B: usize requirement everywhere Andrew Jeffery 2022-03-31 13:53:26 +0100
  • 12f070ce45
         Merge pull request #323 from jeffa5/experiment-update-tree Andrew Jeffery 2022-03-31 07:05:37 -0500
  • a69643c9cc Change set to update to avoid cloning and make it more efficient Andrew Jeffery 2022-03-30 15:24:36 +0100
  • 1c4dc88de3
         Merge pull request #312 from automerge/generate-patches Orion Henry 2022-03-30 16:59:48 -0400
  • ab580df947 Merge remote-tracking branch 'origin/experiment' into getnerate-patches Orion Henry 2022-03-30 13:04:51 -0600
  • 2dcbfbf27d clippy Orion Henry 2022-03-30 13:28:52 -0400
  • f83fb5ec61 More tests Martin Kleppmann 2022-03-18 22:00:23 +0000
  • ab4dc331ac cargo fmt Martin Kleppmann 2022-03-18 17:18:15 +0000
  • a9eddd88cc Bugfix: resurrection of deleted list elements Martin Kleppmann 2022-03-18 16:47:13 +0000
  • 975338900c Document another suspected bug Martin Kleppmann 2022-03-18 15:22:50 +0000
  • 361db06eb5 Delete unnecessary code Martin Kleppmann 2022-03-18 15:21:31 +0000
  • ba177c3d83 Fix broken handling of conflicts on list elements Martin Kleppmann 2022-03-18 15:20:53 +0000
  • fa0a8953dc More tests and comments Martin Kleppmann 2022-03-18 14:32:30 +0000
  • cf508a94a9 Slight simplification Martin Kleppmann 2022-03-18 12:25:36 +0000
  • 289dd95196 Fix index calculation for insertions at the head Martin Kleppmann 2022-03-17 21:23:05 +0000
  • c908979372 Fix search for the correct insertion position Martin Kleppmann 2022-03-17 21:14:44 +0000
  • 7025bb6541 Tests and fixes for list patches Martin Kleppmann 2022-03-17 19:59:21 +0000
  • 145969152a Fix conversion of OpId to ExId when referring to root object Martin Kleppmann 2022-03-17 15:29:57 +0000
  • 94ff10f690 Rename and reformat a bit Martin Kleppmann 2022-03-16 13:37:02 +0000
  • 26efee509d First patch implementation from pairing session with Orion Martin Kleppmann 2022-03-15 21:40:14 +0000
  • 38f3bcb401 0.0.25 Orion Henry 2022-03-30 13:02:43 -0400
  • 21a7bd91dc fix attr del bug Orion Henry 2022-03-30 12:39:55 -0400
  • 62b4354d2e Refactor to push function Andrew Jeffery 2022-03-30 13:59:24 +0100
  • 5386536881 Use one insert_buffer per object Andrew Jeffery 2022-03-30 12:36:50 +0100
  • 3039efca9b Use pending_ops rather than direct len of operations Andrew Jeffery 2022-03-30 12:18:44 +0100
  • 6354985139 Add an insert buffer for transactions Andrew Jeffery 2022-03-30 11:49:11 +0100
  • 4e304d11c6 attribute deletion test attribute-test Rae Mac 2022-03-29 16:06:08 -0700
  • a989e294f8 Use entry api in index Andrew Jeffery 2022-03-29 21:05:09 +0100
  • 3c294d8fca Document some fields on structs Andrew Jeffery 2022-03-29 21:05:03 +0100
  • 0af471a1a1 Document object_type function Andrew Jeffery 2022-03-29 20:45:20 +0100
  • 0da8ceddce Use iter() in IntoIterator Andrew Jeffery 2022-03-29 20:33:38 +0100
  • 08e6a86f28 fmt Orion Henry 2022-03-29 12:07:59 -0400
  • 979b9fd362 Merge branch 'experiment' into marks Orion Henry 2022-03-29 12:04:12 -0400
  • be8f367d07 missing test tag Orion Henry 2022-03-29 11:39:25 -0400
  • 93082ad6a9
         Merge pull request #319 from jeffa5/experiment-broken-list Orion Henry 2022-03-29 11:14:46 -0400
  • fb586455dd
         Merge branch 'experiment' into experiment-broken-list Orion Henry 2022-03-29 11:14:35 -0400
  • 5d9880e1e1
         Merge pull request #320 from jeffa5/experiment-last-elem Orion Henry 2022-03-29 11:08:31 -0400
  • f002e7261b Update comments Andrew Jeffery 2022-03-28 10:37:14 +0100
  • 636fe75647 Simplify query_node for insert and nth Andrew Jeffery 2022-03-28 10:34:00 +0100
  • 1c6032bee0 Reset B to 16 Andrew Jeffery 2022-03-28 10:33:42 +0100
  • fb6f2787b2 Remove last_elem in nth query Andrew Jeffery 2022-03-27 12:26:56 +0100
  • ece1e22283 Fix clippy Andrew Jeffery 2022-03-28 10:05:33 +0100
  • 8f201562c3 Add better comments Andrew Jeffery 2022-03-28 10:04:22 +0100
  • a19aae484c Don't set last_seen unless the elemid was actually visible Andrew Jeffery 2022-03-28 09:19:17 +0100
  • b280138f84 Remove explicit len on index Andrew Jeffery 2022-03-28 09:17:59 +0100
  • 1b5730c0ae Fix insert query to not skip past insert positions Andrew Jeffery 2022-03-27 21:10:23 +0100
  • 49c4bf4911 Rename has to has_visible Andrew Jeffery 2022-03-27 21:10:08 +0100
  • a30bdc3888 Add broken list tests Andrew Jeffery 2022-03-26 10:02:54 +0000
  • e945ebbe74 Remove last_elem from nth_at Andrew Jeffery 2022-03-27 15:35:44 +0100
  • 20229ee2d0 Remove last_elem in nth query Andrew Jeffery 2022-03-27 12:26:56 +0100
  • 83d298ce8d Add test for broken last_elem Andrew Jeffery 2022-03-27 11:55:37 +0100
  • 192356c099
         Merge pull request #318 from jeffa5/experiment-query-consts Andrew Jeffery 2022-03-26 12:35:39 -0500
  • c149da3a6d attr bug Orion Henry 2022-03-26 13:31:39 -0400
  • 666782896d Remove unnecessary consts in queries Andrew Jeffery 2022-03-26 09:11:41 +0000
  • edbfce056c
         Merge pull request #317 from jeffa5/experiment-nonzero-start_op Andrew Jeffery 2022-03-24 12:17:28 -0500
  • 9cb52d127f
         Merge pull request #316 from jeffa5/experiment-errors Andrew Jeffery 2022-03-24 12:17:12 -0500
  • ed244d980a Make start_op be nonzero to prevent bad loads Andrew Jeffery 2022-03-24 16:42:46 +0000
  • ec3785ab2b Expose encoding and decoding errors Andrew Jeffery 2022-03-24 16:20:23 +0000
  • af02ba6b86 0.0.23 - getChangeByHash Orion Henry 2022-03-23 09:49:06 -0400
  • 657bd22d61 Merge branch 'experiment' into marks Orion Henry 2022-03-23 09:35:20 -0400
  • f5e8b998ca expose getChangeByHash in wasm Orion Henry 2022-03-23 09:34:44 -0400
  • 2663e0315c fix test Orion Henry 2022-03-22 13:38:46 -0400
  • bebd310ab6
         Merge pull request #314 from automerge/list-changed Orion Henry 2022-03-22 13:17:50 -0400
  • 9d1890a454 fix the return type of values Orion Henry 2022-03-22 13:13:45 -0400
  • bc98b1ecc9 Example test for confusing behavior Rae Mac 2022-03-22 10:06:13 -0700
  • 84619d8331 Merge branch 'changed_objs' into marks Orion Henry 2022-03-21 17:39:34 -0400
  • 5d4e1f0c42 return touched objects from apply_changes Orion Henry 2022-03-21 17:36:11 -0400
  • 25afa0b12b unmark() - 0.0.21 Orion Henry 2022-03-21 13:36:01 -0400