automerge

ThetaDev/automerge

Fork 0

Commit graph

Select branches

Hide pull requests

alexjg/rc_actor

attribute-test

automerge-1.0

badmessage

big_observer

blame

c_api

clone_fork

columnar-experiments

diff

diff_at

exid

exid_rc

experiment

experiment-make

experiment-query-buffers

faster_sync

faster_sync_clock

feat/add-difference

feat/add-difference_0.3.0

fix-decompress-nits

fuzz-apply-local-change

gh-pages

load-avoid-queue

load_inc

main

mark2

marks

marks2

marks_port

patch2

patch4

patch4-and-betterjs

patch5

patch5-betterjs

payloadtest

pojo2

pojo_js

pojo_js-betterjs

querycache

rc_actor

react-example

rebase-text2

redis

remove-event-handlers

revert-434-better-js-package

rework-ids

simsim

swifty-bindings

text2wip

tmp_pr

wasm-pkg

#10

#101

#102

#103

#104

#105

#106

#107

#108

#11

#112

#113

#115

#116

#117

#118

#119

#12

#120

#123

#124

#126

#129

#13

#130

#131

#132

#133

#134

#135

#136

#138

#14

#140

#141

#144

#146

#147

#148

#149

#150

#152

#153

#154

#155

#156

#157

#159

#160

#161

#162

#163

#164

#165

#166

#168

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#197

#198

#199

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#215

#216

#217

#218

#219

#221

#224

#225

#227

#229

#23

#230

#231

#232

#233

#234

#236

#237

#238

#239

#24

#241

#242

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#260

#261

#262

#263

#265

#268

#270

#271

#272

#273

#274

#275

#276

#277

#278

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#330

#331

#332

#333

#334

#338

#34

#340

#341

#342

#343

#346

#347

#350

#351

#355

#356

#357

#358

#360

#361

#362

#364

#365

#366

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#379

#38

#380

#381

#382

#384

#385

#386

#387

#389

#39

#390

#391

#392

#393

#397

#4

#40

#401

#402

#403

#404

#406

#407

#408

#409

#410

#413

#414

#415

#416

#417

#418

#419

#42

#421

#422

#423

#424

#425

#427

#428

#429

#43

#430

#434

#435

#436

#437

#438

#439

#440

#441

#442

#444

#445

#446

#447

#448

#449

#45

#450

#452

#453

#454

#456

#457

#458

#459

#46

#460

#462

#463

#464

#465

#466

#467

#468

#470

#471

#472

#472

#473

#474

#475

#477

#478

#480

#481

#482

#483

#484

#485

#486

#487

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#5

#500

#501

#503

#505

#506

#507

#508

#509

#51

#510

#511

#512

#514

#515

#516

#517

#518

#519

#52

#520

#521

#523

#523

#524

#524

#529

#530

#531

#533

#534

#538

#540

#540

#541

#542

#543

#544

#544

#545

#548

#550

#550

#551

#551

#552

#552

#554

#554

#56

#59

#6

#60

#61

#62

#63

#64

#65

#66

#68

#69

#71

#72

#73

#74

#78

#79

#8

#80

#82

#84

#85

#86

#87

#88

#9

#90

#91

#92

#93

#94

#96

#97

#98

#99

automerge-js-2.0.0-beta.1

js/automerge-2.0.0

js/automerge-2.0.1

js/automerge-2.0.1-alpha.1

js/automerge-2.0.1-alpha.2

js/automerge-2.0.1-alpha.4

js/automerge-2.0.1-alpha.5

js/automerge-2.0.1-alpha.6

js/automerge-2.0.2

js/automerge-2.0.2-alpha.1

js/automerge-2.0.2-alpha.2

js/automerge-wasm-0.1.17

js/automerge-wasm-0.1.18

js/automerge-wasm-0.1.19

js/automerge-wasm-0.1.20

js/automerge-wasm-0.1.21

js/automerge-wasm-0.1.22

js/automerge-wasm-0.1.23

js/automerge-wasm-0.1.24

js/automerge-wasm-0.1.25

rust/automerge-test@0.1.0

rust/automerge-test@0.2.0

rust/automerge@0.2.0

rust/automerge@0.3.0

v0.0.1

v0.0.2

v0.13.0

fbd76ce2e4 Add transactable import Andrew Jeffery 2022-02-28 11:32:26 +0000
356a410f85 Add quickstart example Andrew Jeffery 2022-02-17 13:36:58 +0000
d80a9c6746 Rename IterKeys and IterKeysAt Andrew Jeffery 2022-02-25 17:07:09 +0000
f8af94b317 Move B to internal Keys Andrew Jeffery 2022-02-25 17:02:16 +0000
6f2536c232 Make keysat double ended Andrew Jeffery 2022-02-25 16:55:49 +0000
4ff456cdcc Update keys to use map Andrew Jeffery 2022-02-25 16:55:18 +0000
989310866f Add DoubleEndedIterator for Keys Andrew Jeffery 2022-02-25 16:50:06 +0000
f51e44c211 Update keys iterator to iterate at the tree level Andrew Jeffery 2022-02-25 12:06:15 +0000
a726cf33c7 Add keys struct for iteration Andrew Jeffery 2022-02-25 11:01:20 +0000
7439593caf Document keys functions Andrew Jeffery 2022-02-25 17:30:34 +0000
fbba1a3c3e Add failing test for marks where merge results in incorrect mark Blaine Cook 2022-02-24 21:47:35 -0800
e07211278f v0.0.14 Orion Henry 2022-02-24 18:44:42 -0500
3c3f411329 update to new autotransaction api Orion Henry 2022-02-24 18:43:44 -0500
5aad691e31 Merge branch 'experiment' into marks Orion Henry 2022-02-24 18:10:19 -0500
337fabe5a9

Merge pull request #271 from jeffa5/experiment-txn Orion Henry 2022-02-24 18:07:05 -0500
872efc5756 v10 Orion Henry 2022-02-24 00:23:32 -0500
e37395f975 make() defaults to text Orion Henry 2022-02-24 00:22:56 -0500
a84fa64554 change MAP,LIST,TEXT to be {},[],'' - allow recursion Orion Henry 2022-02-23 19:43:13 -0500
a37d4a6870 spans will now respect non-graphmem values Orion Henry 2022-02-24 16:41:01 -0500
5eb5714c13 add failing test for marks handling in 3-way merge scenario Blaine Cook 2022-02-23 21:30:47 -0800
4f9b95b5b8 add test for merge behaviour of marks Blaine Cook 2022-02-23 10:11:43 -0800
1c61986d33 clippy and fmt Orion Henry 2022-02-24 15:21:05 -0500
bde0a6fbf6 Cleaned up some warnings and errors running against Rust 1.58.1 David Pollak 2022-02-21 10:51:30 -0800
f52b9a13f7 Added Doxygen documentation generation. Renamed AMDatatype to AmDataType. Reorganized the AmDataType tags. Renamed AMfree() to AMdestroy(). Renamed AMclone() to AMdup(). c_api Jason Kankiewicz 2022-02-23 02:14:06 -0800
22932125ad add failing test for marks handling in 3-way merge scenario Blaine Cook 2022-02-23 21:30:47 -0800
06302e4a17 make() defaults to text Orion Henry 2022-02-24 00:22:56 -0500
2fc0705907 change MAP,LIST,TEXT to be {},[],'' - allow recursion Orion Henry 2022-02-23 19:43:13 -0500
96d5bf54c9 add test for merge behaviour of marks Blaine Cook 2022-02-23 10:11:43 -0800
27ded5402b Added Doxygen documentation generation. Renamed AMDatatype to AmDataType. Reorganized the AmDataType tags. Renamed AMfree() to AMdestroy(). Renamed AMclone() to AMdup(). Jason Kankiewicz 2022-02-23 02:14:06 -0800
36b4f08d20 wasm to 0.0.7 Orion Henry 2022-02-10 21:08:28 -0500
015e8ce465 choking on bad value function Orion Henry 2022-02-15 14:40:40 -0500
ea2f29d681 wasm to 0.0.6 Orion Henry 2022-02-10 21:08:28 -0500
c8cd069e51 tweak files Orion Henry 2022-02-10 19:15:02 -0500
2ba2da95a8 attempt at new packaging Orion Henry 2022-02-10 14:41:57 -0500
561cad44e3 Revert "remove marks" Orion Henry 2022-02-10 11:42:58 -0500
b96aa168b4 choking on bad value function Orion Henry 2022-02-15 14:40:40 -0500
8e24e5772d get simple test passing Orion Henry 2022-02-22 11:30:42 -0500
73a9b9bb24 rework to return a queriable result Orion Henry 2022-02-09 15:50:44 -0500
77fb2385f5 fmt Orion Henry 2022-02-10 11:48:09 -0500
6a7bc720e2 remove marks Orion Henry 2022-02-10 11:38:12 -0500
4c66e21d1b move marks into its own test Orion Henry 2022-02-10 11:17:15 -0500
80640ac799 bugfix: duplicate seq not blocked on apply_changes, clone did not close a transaction, added fork and merge to wasm Orion Henry 2022-02-10 11:14:44 -0500
ec3f6cd69f Add failing test for decoding a conflicted merge Karissa McKelvey 2022-02-08 16:34:08 -0800
4c5bece1f6 Add support for web rae 2022-02-07 16:33:10 -0800
312094575b fix version number Orion Henry 2022-02-06 19:57:25 -0500
1ee179b943 cleanup typescript defs Orion Henry 2022-02-06 19:01:37 -0500
a14d272902 fix bug in set scalar Orion Henry 2022-02-04 20:15:57 -0500
efbc397e02 better error on invalid value Orion Henry 2022-02-04 14:43:22 -0500
dabf941370 spans have types not names Orion Henry 2022-02-02 16:29:23 -0500
ec879d13dd raw_spans with ids Orion Henry 2022-02-02 16:21:33 -0500
0987514204 raw_spans experiment Orion Henry 2022-02-02 15:55:41 -0500
d46608bed0 adding make Orion Henry 2022-01-31 17:45:07 -0500
a54f6e30c8 Revert "Remove make" Orion Henry 2022-01-31 17:43:56 -0500
2bc8d18f89 Remove make Orion Henry 2022-01-31 17:28:24 -0500
b0ba6fa733 fixed fixed Orion Henry 2022-01-31 17:24:46 -0500
c4d5533ed3 use types in pkg Orion Henry 2022-01-31 17:24:17 -0500
2e4ac5e0e1 fix return types Orion Henry 2022-01-31 17:21:16 -0500
9e628201ab remove dead code Orion Henry 2022-01-31 17:11:22 -0500
b41a758ff4 all ts tests passing Orion Henry 2022-01-31 17:07:20 -0500
5c2a8e25ac almost working ts Orion Henry 2022-01-31 16:48:03 -0500
4a8c611e57 Fix typescript errors in test Karissa McKelvey 2022-01-31 13:03:27 -0800
456766c348 uint datatypes & fix some more typescript errors Karissa McKelvey 2022-01-31 12:48:49 -0800
8e0563d4f1 half done - not working typescript Orion Henry 2022-01-31 15:23:46 -0500
b0998995f4 cleanup / rename Orion Henry 2022-01-28 12:37:35 -0500
188936a711 mark encode/decode/serde Orion Henry 2022-01-28 12:24:58 -0500
8541e2246a rework marks as inserts between values Orion Henry 2022-01-27 08:49:44 -0500
79ccf65a91 v0 wip Orion Henry 2022-01-25 19:19:51 -0500
871fc9febe Update app to include text editor, import Automerge correctly karissa 2022-01-28 21:33:24 -0700
f435d81156 remove from package.json Orion Henry 2022-01-28 18:58:47 -0500
183507d6a6 remove tmp file Orion Henry 2022-01-28 18:07:08 -0500
c0b26c307c add cra example code Orion Henry 2022-01-28 18:05:33 -0500
2c483c6c68 rework wasm function to use js types more directly Orion Henry 2022-01-28 16:41:17 -0500
585b0a0cc7 Change rust flake to use default profile Andrew Jeffery 2022-02-04 16:58:48 +0000
93672e6c08 flake.lock: Update Andrew Jeffery 2022-02-04 16:56:38 +0000
9d31754659 Add from () for Value Andrew Jeffery 2022-02-04 11:37:33 +0000
5b7f270b75 Cleaned up some warnings and errors running against Rust 1.58.1 David Pollak 2022-02-21 10:51:30 -0800
8d24c9e4c3 Fix rollback of transaction using index into the tree Andrew Jeffery 2022-02-21 14:00:41 +0000
4a6b91adb2 Add test for broken rollback Andrew Jeffery 2022-02-21 13:29:59 +0000
6b4393c0b3 Rename transaction module Andrew Jeffery 2022-02-21 11:40:49 +0000
355cbdd251 Rename try_start_transaction to ensure_transaction_open Andrew Jeffery 2022-02-21 10:49:58 +0000
3493dbd74a Rename autotxn to autocommit Andrew Jeffery 2022-02-21 10:49:14 +0000
cbd3406f8d Document commit_with and CommitOptions Andrew Jeffery 2022-02-21 10:47:23 +0000
66f8c73dba Document drop on transaction Andrew Jeffery 2022-02-21 10:36:42 +0000
50a1b4f99c Add transactable trait Andrew Jeffery 2022-02-21 10:32:57 +0000
f8c9343a45 Add get_heads to transaction Andrew Jeffery 2022-02-19 18:57:32 +0000
68491b66a3 Move some backend functions to traversal Andrew Jeffery 2021-07-22 10:43:45 +0100
3cf2044a07 Move vector clock implementation to new module Andrew Jeffery 2021-07-20 14:49:54 +0100
7991369dfa Add semicolon Andrew Jeffery 2021-07-20 11:12:36 +0100
729e6ccbce Document vector clock usage Andrew Jeffery 2021-07-19 16:44:51 +0100
d3783b6a94 Sync perf Andrew Jeffery 2021-07-19 16:27:07 +0100
907df09b6a Use queue when getting vector clocks to do BFS Andrew Jeffery 2021-07-19 16:23:45 +0100
1a8f5c159f Cleanup code Andrew Jeffery 2021-07-19 16:14:39 +0100
a654e2b548 Tidy imports Andrew Jeffery 2021-07-19 16:14:32 +0100
e57e839022 Just use vector clocks in retain Andrew Jeffery 2021-07-19 15:56:27 +0100
7ceee4957e Print length of may_find Andrew Jeffery 2021-07-19 15:50:29 +0100
1cd32a295f Use clock in filter_changes Andrew Jeffery 2021-07-19 15:45:19 +0100
f5d9d3a105 Add clocks cache Andrew Jeffery 2021-07-19 15:21:58 +0100
abef4dac8c Don't clone actor id Andrew Jeffery 2021-07-19 14:31:21 +0100
601ba7a50c Use vector clock for slow path Andrew Jeffery 2021-07-19 13:39:47 +0100
a76428dfc1 Use vector clock for get_changes Andrew Jeffery 2021-07-19 12:14:47 +0100