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

Commit graph

  • cee363a074
         update edit trace Orion Henry 2022-11-24 14:55:51 -0800
  • 7946f22fa0
         Text v2. JS Api now uses text by default - patch api heavily updated to allow - several concurrency/patch bugs fixed Orion Henry 2022-11-04 10:11:34 -0500
  • 0960b4d2b6 Fix tests Conrad Irwin 2022-12-02 10:25:44 -0700
  • becc301877
         automerge-wasm@0.1.19 & automerge-js@2.0.1-alpha.2 js/automerge-wasm-0.1.19 js/automerge-2.0.1-alpha.2 Alex Good 2022-12-02 15:10:24 +0000
  • 62b73ddec0 deploy: 0ab6a770d8 alexjg 2022-12-02 14:48:29 +0000
  • 0ab6a770d8 wasm: improve error messages Alex Good 2022-12-01 23:22:12 +0000
  • 2826f4f08c
         automerge-wasm: Add deno as a target Alex Currie-Clark 2022-12-02 14:42:13 +0000
  • 3200dd08e7
         wasm: improve error messages Alex Good 2022-12-01 23:22:12 +0000
  • cbfa7ff57f deploy: de16adbcc5 alexjg 2022-12-02 12:15:23 +0000
  • de16adbcc5 Explicity create empty changes Alex Good 2022-11-30 18:04:49 +0000
  • ea5688e418 rust: Make fields of Transaction and TransactionInner private Alex Good 2022-11-30 16:38:35 +0000
  • 149f870102 rust: Remove Default constraint from OpObserver Alex Good 2022-11-30 16:38:09 +0000
  • 66b4b2d76a
         Explicity create empty changes Alex Good 2022-11-30 18:04:49 +0000
  • 0cdb130988 wip text2wip Orion Henry 2022-12-01 11:31:14 -0600
  • ba066153eb Re-alphabetized the AutomergeError variants. Jason Kankiewicz 2022-11-30 23:30:25 -0800
  • 6830131d03 Fixed a clippy violation. Jason Kankiewicz 2022-11-30 23:29:55 -0800
  • c5a24351c4 Aligned the failing automerge-c unit test cases with "TextV2" behavior for @orionz. Jason Kankiewicz 2022-11-30 23:29:28 -0800
  • b5499cb695
         rust: Make fields of Transaction and TransactionInner private Alex Good 2022-11-30 16:38:35 +0000
  • 0d32fe8575
         rust: Remove Default constraint from OpObserver Alex Good 2022-11-30 16:38:09 +0000
  • e0b2bc995a
         Update nix flake and add formatter and dead code check (#466) Andrew Jeffery 2022-11-30 12:57:59 +0000
  • ff319b37d2 Add deadnix check and fixup devshells naming Andrew Jeffery 2022-11-30 09:49:52 +0000
  • 441dcec21b Remove unused vars in flake Andrew Jeffery 2022-11-30 09:43:41 +0000
  • 5c1b9a074a Update flake inputs Andrew Jeffery 2022-11-30 09:42:49 +0000
  • 6acea50b68 Add formatter for flake Andrew Jeffery 2022-11-30 09:42:23 +0000
  • 407b3116db Fix build on mac Conrad Irwin 2022-11-29 22:35:56 -0700
  • 833a91d22d More detailed instructions in README Conrad Irwin 2022-11-29 14:08:43 -0700
  • d993c74f44 Use AMbyteSpan for byte values Conrad Irwin 2022-11-29 14:10:01 -0700
  • ea9596f4d9 Get to the right API to see the failure I was after Issac Kelly 2022-11-29 17:52:11 -0800
  • c504eb5f52 Add empty transaction test, which is passing Issac Kelly 2022-11-29 17:28:24 -0800
  • df59eea28a the patch callback is called once with all patches Orion Henry 2022-11-28 14:35:28 -0600
  • 4d9644226a throw errors if ops are used on the wrong type (map,list,text) - this broke several tests as it makes all the api uses more strict Orion Henry 2022-11-28 00:36:19 -0600
  • a85a2b0c66 deploy: aaddb3c9ea orionz 2022-11-28 21:45:52 +0000
  • 81a461f374 add an error message for splicing non-text objects Orion Henry 2022-11-27 19:30:16 -0600
  • 18a06139f6 make doc accessable from observer functions - prep work for fixing the expose issue Orion Henry 2022-11-27 19:01:52 -0600
  • 5547b39df4 update edit trace Orion Henry 2022-11-24 14:55:51 -0800
  • d212b60e01 Text v2. JS Api now uses text by default - patch api heavily updated to allow - several concurrency/patch bugs fixed Orion Henry 2022-11-04 10:11:34 -0500
  • aaddb3c9ea fix error message Orion Henry 2022-11-28 15:43:27 -0600
  • e647763b4e deploy: 2400d67755 orionz 2022-11-28 20:37:15 +0000
  • 2400d67755
         Merge pull request #457 from jkankiewicz/return_NUL_string_as_bytes Orion Henry 2022-11-28 12:34:45 -0800
  • d3885a3443 Hard-coded automerge-c's initial independent version number to "0.0.1" for @alexjg. Jason Kankiewicz 2022-11-28 00:08:33 -0800
  • f8428896bd Added a test case for a map key containing NUL ('\0') based on #455. Jason Kankiewicz 2022-11-19 14:13:51 -0800
  • fb0c69cc52 Updated the quickstart example to work with AMbyteSpan values instead of *const libc::c_char values. Jason Kankiewicz 2022-11-18 23:56:58 -0800
  • edbb33522d Replaced the C string (*const libc::c_char) value of the AMresult::Error variant with a UTF-8 string view (AMbyteSpan). Jason Kankiewicz 2022-11-18 23:53:44 -0800
  • 625f48f33a Fixed clippy violations. Jason Kankiewicz 2022-11-18 10:12:23 -0800
  • 7c9f927136 Fixed code formatting violations. Jason Kankiewicz 2022-11-18 09:50:52 -0800
  • b60c310f5c Changed Default::default() calls to be through the trait. Jason Kankiewicz 2022-11-18 09:34:21 -0800
  • 3dd954d5b7 Moved the to_obj_id macro in with AMobjId. Jason Kankiewicz 2022-11-18 09:31:04 -0800
  • 3e2e697504 Replaced C string (*const libc::c_char) values with UTF-8 string view (AMbyteSpan) values except with the AMresult::Error variant. Added AMstr() for creating an AMbyteSpan from a C string. Jason Kankiewicz 2022-11-18 09:28:32 -0800
  • a324b02005 Added automerge::AutomergeError::InvalidActorId. Added automerge::AutomergeError::InvalidCharacter. Alphabetized the automerge::AutomergeError variants. Jason Kankiewicz 2022-11-18 09:06:01 -0800
  • ae3d3c27db deploy: d26cb0c0cb alexjg 2022-11-27 17:01:04 +0000
  • d26cb0c0cb
         rust:automerge-test:0.1.0 rust/automerge-test@0.1.0 Alex Good 2022-11-27 16:54:00 +0000
  • ed108ba6fc
         rust:automerge:0.2.0 rust/automerge@0.2.0 Alex Good 2022-11-27 16:43:04 +0000
  • 5acc47af10 deploy: 484a5bac4f alexjg 2022-11-27 16:42:30 +0000
  • 484a5bac4f
         rust: Add Transactable::base_heads Alex Good 2022-11-27 16:39:02 +0000
  • 6806c9e1df Re-enable ci jobs Alex Currie-Clark 2022-11-25 11:55:39 +0000
  • b8d1c97129 Add correct file permissions to deno_tests script Alex Currie-Clark 2022-11-25 11:38:09 +0000
  • dae234b871 Moved deno tests to their own script and ci job Alex Currie-Clark 2022-11-25 11:23:04 +0000
  • a74fc10662 Add deno test to actions Alex Currie-Clark 2022-11-25 10:22:36 +0000
  • f128a3dbb2 Add basic deno test Alex Currie-Clark 2022-11-25 10:10:34 +0000
  • b6a88aae35
         Merge branch 'automerge:main' into main Alex Currie-Clark 2022-11-24 12:42:55 +0000
  • 01350c2b3f
         automerge-wasm@0.1.18 and automerge@2.0.1-alpha.1 js/automerge-wasm-0.1.18 js/automerge-2.0.1-alpha.1 Alex Good 2022-11-22 19:37:01 +0000
  • 4f40b01e80 deploy: 22d60987f6 alexjg 2022-11-22 18:32:03 +0000
  • 22d60987f6
         Dont send duplicate sync messages (#460) alexjg 2022-11-22 18:29:06 +0000
  • 1381e7369a
         Dont send duplicate sync messages Alex Good 2022-11-21 01:40:53 +0000
  • 66ab06df3a deploy: bbf729e1d6 alexjg 2022-11-22 12:30:54 +0000
  • bbf729e1d6
         @automerge/automerge 2.0.0 js/automerge-wasm-0.1.17 js/automerge-2.0.0 Alex Good 2022-11-21 18:11:41 +0000
  • ca25ed0ca0
         automerge-wasm: Use a SequenceTree in the OpObserver Orion Henry 2022-11-03 12:10:29 -0500
  • 03b3da203d
         @automerge/automerge-wasm 0.1.16 Alex Good 2022-11-22 00:02:13 +0000
  • 90ea7cd137 deploy: e713c35d21 alexjg 2022-11-21 18:29:43 +0000
  • e713c35d21
         Fix some typescript errors Alex Good 2022-11-21 18:26:28 +0000
  • 4ffad216d8 Added deno as a target to package.json Alex Currie-Clark 2022-11-18 11:01:30 +0000
  • 92c044eadb
         Bump loader-utils in /javascript/examples/create-react-app dependabot[bot] 2022-11-16 13:35:34 +0000
  • bf9593296c
         wip simsim Alex Good 2022-11-10 12:27:46 +0000
  • b724b217cd
         Bump loader-utils in /javascript/examples/create-react-app dependabot[bot] 2022-11-09 19:12:36 +0000
  • a7656b999b
         Add AMobjObjType() (#454) Jason Kankiewicz 2022-11-07 15:10:53 -0800
  • 10482444a4 Remove an unused import for clippy. Jason Kankiewicz 2022-11-07 12:55:06 -0800
  • 82acdd857f Added AMobjObjType() assertions to the AMlistPutObject() and AMmapPutObject() test cases. Added AM_OBJ_TYPE_VOID assertions to the AMlistPutObject() and AMmapPutObject() test cases. Jason Kankiewicz 2022-11-07 12:40:28 -0800
  • 6621fe6a0b Return AMresult::err instead of panicking when AMlistPutObject() or AMmapPutObject() are called with an AM_OBJ_TYPE_VOID argument. Replaced the phrase "epoch timestamp" with "*nix timestamp (milliseconds)" for @alexjg. Jason Kankiewicz 2022-11-07 11:17:56 -0800
  • 2b276e5f25 Renamed the AMobjType::Unknown variant to AMobjType::Void. Jason Kankiewicz 2022-11-07 08:18:50 -0800
  • 4bbbabe9aa Replaced the phrase "epoch timestamp" with "*nix timestamp (milliseconds)" for @alexjg. Replaced the phrase "time override as seconds since the epoch" with "*nix timestamp (milliseconds)" for consistency. Replaced the *const libc:time_t argument with a *const i64 argument in AMcommit() for consistency. Jason Kankiewicz 2022-11-07 08:03:31 -0800
  • dd4cc80192 deploy: 05093071ce alexjg 2022-11-07 12:10:06 +0000
  • 05093071ce
         rust/automerge-test: add From<f64> for RealizedObject Alex Good 2022-11-07 12:08:12 +0000
  • fb7d5513a0 Make test_should_be_able_to_insert_objects_into_text() pass on Windows. Jason Kankiewicz 2022-11-07 00:32:32 -0800
  • 6e4c6c1c0a Added AMobjObjType() for @ConradIrwin. Jason Kankiewicz 2022-11-06 23:48:14 -0800
  • 9e86e737c8 Renamed "Lamport timestamp" to "epoch timestamp" within the documentation for @ConradIrwin. Jason Kankiewicz 2022-11-06 23:41:27 -0800
  • 72504006a9 deploy: bcab3b6e47 alexjg 2022-11-06 19:55:17 +0000
  • bcab3b6e47 Move automerge/tests::helpers to crate automerge-test Alex Good 2022-11-05 22:37:44 +0000
  • 3c97a55315
         Move automerge/tests::helpers to crate automerge-test Alex Good 2022-11-05 22:37:44 +0000
  • 4f29f64c66 deploy: b53584bec0 alexjg 2022-11-05 22:51:03 +0000
  • b53584bec0
         Ritual obeisance before the altar of clippy Alex Good 2022-11-05 22:48:43 +0000
  • 23d44f7e4e deploy: 91f313bb83 alexjg 2022-11-04 18:05:26 +0000
  • 91f313bb83 revert compiler flags to max opt Orion Henry 2022-11-04 12:40:09 -0500
  • a9e9b5340d revert compiler flags to max opt Orion Henry 2022-11-04 12:40:09 -0500
  • bc9f0583be swap out vec for seq_tree in observer for big patch big_observer Orion Henry 2022-11-03 12:10:29 -0500
  • 5739eda0a7 Add getObjType Conrad Irwin 2022-11-02 09:13:12 -0600
  • e5d798f3ad deploy: 6bbed76f0f alexjg 2022-11-01 11:42:51 +0000
  • 6bbed76f0f Update uuid dependency to v1.2.1 tosti007 2022-11-01 09:42:08 +0100
  • 3a432e3d70 Update uuid dependency to v1.2.1 tosti007 2022-11-01 09:42:08 +0100
  • c40635b3c4 deploy: bba4fe2c36 alexjg 2022-10-28 10:35:43 +0000
  • bba4fe2c36
         @automerge/automerge@2.0.0-beta.4 Alex Good 2022-10-28 11:31:51 +0100