ThetaDev/automerge
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
195 commits 52 branches 27 tags 40 MiB
Commit graph

195 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jason Kankiewicz
f52b9a13f7 Added Doxygen documentation generation. 
Renamed `AMDatatype` to `AmDataType`.
Reorganized the `AmDataType` tags.
Renamed `AMfree()` to `AMdestroy()`.
Renamed `AMclone()` to `AMdup()`.
 2022-02-24 14:39:38 -05:00
Orion Henry
8e24e5772d get simple test passing 2022-02-22 11:30:42 -05:00
Orion Henry
73a9b9bb24 rework to return a queriable result 2022-02-22 10:21:45 -05:00
Orion Henry
77fb2385f5 fmt 2022-02-22 10:21:45 -05:00
Orion Henry
6a7bc720e2 remove marks 2022-02-22 10:21:45 -05:00
Orion Henry
4c66e21d1b move marks into its own test 2022-02-22 10:21:45 -05:00
Orion Henry
80640ac799 bugfix: duplicate seq not blocked on apply_changes, clone did not close a transaction, added fork and merge to wasm 2022-02-22 10:21:45 -05:00
Karissa McKelvey
ec3f6cd69f Add failing test for decoding a conflicted merge 2022-02-22 10:21:45 -05:00
rae
4c5bece1f6 Add support for web 2022-02-22 10:21:45 -05:00
Orion Henry
312094575b fix version number 2022-02-22 10:21:45 -05:00
Orion Henry
1ee179b943 cleanup typescript defs 2022-02-22 10:21:45 -05:00
Orion Henry
a14d272902 fix bug in set scalar 2022-02-22 10:21:45 -05:00
Orion Henry
efbc397e02 better error on invalid value 2022-02-22 10:21:44 -05:00
Orion Henry
dabf941370 spans have types not names 2022-02-22 10:21:44 -05:00
Orion Henry
ec879d13dd raw_spans with ids 2022-02-22 10:21:44 -05:00
Orion Henry
0987514204 raw_spans experiment 2022-02-22 10:21:44 -05:00
Orion Henry
d46608bed0 adding make 2022-02-22 10:21:44 -05:00
Orion Henry
a54f6e30c8 Revert "Remove make" 
This reverts commit 5b9360155c.
 2022-02-22 10:21:44 -05:00
Orion Henry
2bc8d18f89 Remove make 2022-02-22 10:21:44 -05:00
Orion Henry
b0ba6fa733 fixed fixed 2022-02-22 10:21:44 -05:00
Orion Henry
c4d5533ed3 use types in pkg 2022-02-22 10:21:44 -05:00
Orion Henry
2e4ac5e0e1 fix return types 2022-02-22 10:21:44 -05:00
Orion Henry
9e628201ab remove dead code 2022-02-22 10:21:43 -05:00
Orion Henry
b41a758ff4 all ts tests passing 2022-02-22 10:21:43 -05:00
Orion Henry
5c2a8e25ac almost working ts 2022-02-22 10:21:43 -05:00
Karissa McKelvey
4a8c611e57 Fix typescript errors in test 2022-02-22 10:21:43 -05:00
Karissa McKelvey
456766c348 uint datatypes & fix some more typescript errors 2022-02-22 10:21:43 -05:00
Orion Henry
8e0563d4f1 half done - not working typescript 2022-02-22 10:21:43 -05:00
Orion Henry
b0998995f4 cleanup / rename 2022-02-22 10:21:43 -05:00
Orion Henry
188936a711 mark encode/decode/serde 2022-02-22 10:21:43 -05:00
Orion Henry
8541e2246a rework marks as inserts between values 2022-02-22 10:21:42 -05:00
Orion Henry
79ccf65a91 v0 wip 2022-02-22 10:21:42 -05:00
karissa
871fc9febe Update app to include text editor, import Automerge correctly 2022-02-22 10:21:42 -05:00
Orion Henry
f435d81156 remove from package.json 2022-02-22 10:21:42 -05:00
Orion Henry
183507d6a6 remove tmp file 2022-02-22 10:21:42 -05:00
Orion Henry
c0b26c307c add cra example code 2022-02-22 10:21:42 -05:00
Orion Henry
2c483c6c68 rework wasm function to use js types more directly 2022-02-22 10:21:41 -05:00
Andrew Jeffery
585b0a0cc7 Change rust flake to use default profile 2022-02-22 10:21:41 -05:00
Andrew Jeffery
93672e6c08 flake.lock: Update 
Flake lock file changes:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28' (2021-04-25)
  → 'github:numtide/flake-utils/846b2ae0fc4cc943637d3d1def4454213e203cba' (2022-01-20)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/63586475587d7e0e078291ad4b49b6f6a6885100' (2021-05-06)
  → 'github:nixos/nixpkgs/554d2d8aa25b6e583575459c297ec23750adb6cb' (2022-02-02)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/d8efe70dc561c4bea0b7bf440d36ce98c497e054' (2021-05-07)
  → 'github:oxalica/rust-overlay/674156c4c2f46dd6a6846466cb8f9fee84c211ca' (2022-02-04)
• Updated input 'rust-overlay/flake-utils':
    'github:numtide/flake-utils/5466c5bbece17adaab2d82fae80b46e807611bf3' (2021-02-28)
  → 'github:numtide/flake-utils/bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4' (2021-11-15)
• Updated input 'rust-overlay/nixpkgs':
    'github:nixos/nixpkgs/54c1e44240d8a527a8f4892608c4bce5440c3ecb' (2021-04-02)
  → 'github:NixOS/nixpkgs/8afc4e543663ca0a6a4f496262cd05233737e732' (2021-11-21)
 2022-02-22 10:21:41 -05:00
Andrew Jeffery
9d31754659 Add from () for Value 2022-02-22 10:21:41 -05:00
Jason Kankiewicz
930b9a850f Add a CI step to run the CMake build of the C bindings for @alexjg. 2022-02-16 13:24:08 -08:00
Jason Kankiewicz
3290492235 Add CMake instructions for @orionz. 2022-02-16 13:24:08 -08:00
Jason Kankiewicz
b62e2fcf96 Add CMake support. 2022-02-16 13:24:08 -08:00
Jason Kankiewicz
ec5fe444b9 Replace *intptr_t in C function signatures. 2022-02-16 13:24:08 -08:00
Orion Henry
851ec6c6d3 am_pop and am_pop_value 2022-02-06 18:59:19 -05:00
Orion Henry
17104686a2 break the ground 2022-02-03 19:43:36 -05:00
Orion Henry
bf184fe980 remove some un needed imports 2022-02-03 14:43:02 -05:00
Orion Henry
2019943849 bump edition from 2018 to 2021 2022-02-03 14:38:21 -05:00
Orion Henry
3393a60e59 clippy lint 2022-01-20 14:17:11 -08:00
Orion Henry
7b3db2f15a clippy lint 2022-01-20 14:17:11 -08:00