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

37717f2798 Cargo fmt Andrew Jeffery 2021-05-19 19:10:34 +0100
098cfc585d

Fix expansion of multi insert indexes (#138) Andrew Jeffery 2021-05-19 19:08:52 +0100
704e7c4a62 Fix expansion of multi insert indexes Andrew Jeffery 2021-05-19 19:03:35 +0100
e619a34c5c Remove dbg Andrew Jeffery 2021-05-19 10:44:25 +0100
bde9f14510 Switch back to using Vec<u8> Vedant Roy 2021-05-18 15:32:48 -0700
3abff40e4c Add comments from JS version Vedant Roy 2021-05-18 14:58:12 -0700
56c1e8ae8a add c binding Vedant Roy 2021-05-18 14:53:49 -0700
5bc99c4cfc Satisfy clippy Vedant Roy 2021-05-18 14:31:21 -0700
365af03410 Fix serialization + add test Vedant Roy 2021-05-18 14:28:53 -0700
f3560b9f5a Add apply_patch test Vedant Roy 2021-05-18 14:00:59 -0700
c44f6e716b Internal representation = base64 string Vedant Roy 2021-05-18 13:54:26 -0700
ddc9c6d4ce Add missing Safety header Vedant Roy 2021-05-18 13:12:00 -0700
0df5444669 Better sync test Vedant Roy 2021-05-18 12:40:21 -0700
4b7886dfe6 Remove unused var Vedant Roy 2021-05-18 12:13:43 -0700
acf4f19cd5 Make comment clearer Vedant Roy 2021-05-18 11:28:29 -0700
98c6ac876d Implement encode/decode for SyncState Vedant Roy 2021-05-18 11:23:21 -0700
e2e7483a07

Use elem id from insertion in frontend (#134) Andrew Jeffery 2021-05-18 21:24:55 +0100
6009d809fd Add missing Safety header Vedant Roy 2021-05-18 13:12:00 -0700
a0596dd452 Add bytes type Vedant Roy 2021-05-18 13:05:22 -0700
ce6ce65e52 Better sync test Vedant Roy 2021-05-18 12:40:21 -0700
d5c03ea64d Also run on stacked PRs Andrew Jeffery 2021-05-18 20:27:04 +0100
697641fad5 Remove unused var Vedant Roy 2021-05-18 12:13:43 -0700
a54b3f93e0 Make comment clearer Vedant Roy 2021-05-18 11:28:29 -0700
52fcf07727 Implement encode/decode for SyncState Vedant Roy 2021-05-18 11:23:21 -0700
34e036207f Use elem id from insertion in frontend Andrew Jeffery 2021-05-18 18:44:11 +0100
0c7d56051a Fix inverted bool + return correct data + remove serde Vedant Roy 2021-05-18 10:30:47 -0700
f47ba3c46a small error slipped through Orion Henry 2021-05-18 10:59:39 -0400
6a4a3c5a00 Don't use ..Default::default() + formatting? Vedant Roy 2021-05-17 21:41:12 -0700
1b76115f27 Add unsafe docs + remove extraneous file Vedant Roy 2021-05-14 09:56:39 -0700
c274d18528 Add test for sync c bindings Vedant Roy 2021-05-12 11:10:17 -0700
305d089180 Add untested C-bindings for sync state Vedant Roy 2021-05-12 10:54:21 -0700
9a2f63d452 Don't use ..Default::default() + formatting? Vedant Roy 2021-05-17 21:41:12 -0700
3c1d8e290c Implement getAddedChanges Vedant Roy 2021-05-17 20:59:08 -0700
87410e4c8f Add comment explaining why it doesn't work Alex Good 2021-05-17 19:53:36 +0100
9bbaf7cbd5 Merge branch 'main' into implement-new-sequence-patch-format Alex Good 2021-05-17 13:03:57 +0100
426ccbc818

Expose event handler id (#132) Andrew Jeffery 2021-05-16 20:16:54 +0100
c336f26998 Expose event handler id Andrew Jeffery 2021-05-16 18:51:48 +0100
71c7752907 Set console_error_panic_hook when initing a backend Andrew Jeffery 2021-05-16 14:48:13 +0100
5637956895 Add custom RootDiff type Andrew Jeffery 2021-05-16 14:02:57 +0100
30a89cb49d Fix clippy lints Andrew Jeffery 2021-05-16 13:10:28 +0100
2e07e93e72 Change patches diffs to be non-optional Andrew Jeffery 2021-05-16 13:01:37 +0100
f2025028cf Fix elem_id in get_patch test Andrew Jeffery 2021-05-15 19:38:11 +0100
553bf1f8ef Handle overwriting inserts with updates from the same actor Andrew Jeffery 2021-05-15 19:14:16 +0100
96eef611d0 Default head to index 0 Andrew Jeffery 2021-05-15 18:05:25 +0100
7c4858e686 Fix obtaining index for set operation Andrew Jeffery 2021-05-15 18:01:03 +0100
6eb96f2816 Split patch generation out of OpSet Alex Good 2021-05-14 21:56:24 +0100
641fd11703

Change init to new and add defaults (#130) Andrew Jeffery 2021-05-14 21:35:09 +0100
df3770477b Move initial patch generation to patches::from_scratch_diff Alex Good 2021-05-14 21:13:07 +0100
7d3e0ccc37 Move pending diffs into new patches module Alex Good 2021-05-14 20:42:04 +0100
d82e2ed217

Improve filter_changes for sync (#126) Andrew Jeffery 2021-05-14 20:20:27 +0100
f6f874439b

Move decoding to a new module and separate errors (#129) Andrew Jeffery 2021-05-14 20:20:05 +0100
53ef0a76cd Change init to new and add defaults Andrew Jeffery 2021-05-14 20:02:52 +0100
74bc4a44e7 Move decoding to a new module and separate errors Andrew Jeffery 2021-05-14 19:29:47 +0100
061d54e624 Add unsafe docs + remove extraneous file Vedant Roy 2021-05-14 09:56:39 -0700
2aa35bc349

Add derive Arbitrary support behind cargo feature (#124) Andrew Jeffery 2021-05-14 16:38:35 +0100
7f8f6fc3f7 Find max head index once Andrew Jeffery 2021-05-14 09:12:36 +0100
e923ffe0fb Improve filter_changes for sync Andrew Jeffery 2021-05-13 22:33:51 +0100
3d5590f90a wip Alex Good 2021-05-13 18:39:05 +0100
023d9e8539 Add derive Arbitrary support behind cargo feature Andrew Jeffery 2021-05-12 23:08:30 +0100
7ccaae92fd Add test for updates inside conflicted list elements Alex Good 2021-05-12 23:00:03 +0100
0f3a8ec016 Add test for sync c bindings Vedant Roy 2021-05-12 11:10:17 -0700
fe06dcced4 Add untested C-bindings for sync state Vedant Roy 2021-05-12 10:54:21 -0700
5713f4263f Update op id Andrew Jeffery 2021-05-12 16:29:24 +0100
d36149e3ce Update js hash Andrew Jeffery 2021-05-12 16:16:05 +0100
576a2736f6 Sort diffs by actor id Andrew Jeffery 2021-05-12 15:11:14 +0100
31e245e3b7 Handle conflicts with multiple updates Andrew Jeffery 2021-05-12 14:29:14 +0100
833149d77f Fix returning an operation for increments Andrew Jeffery 2021-05-12 13:42:06 +0100
e5f70ddcb6 Allow del in gen_seq_diff Andrew Jeffery 2021-05-11 22:42:04 +0100
e2ec827d66 Ensure we execute diffs for nested objects from lists Andrew Jeffery 2021-05-11 20:45:28 +0100
4242415f5b Return empty mapdiff when no root object in pending Andrew Jeffery 2021-05-11 17:01:11 +0100
94c02f061c Use actual op.id in update Andrew Jeffery 2021-05-11 16:21:02 +0100
cf1ad2c5f8 Use proper key for elem_id Andrew Jeffery 2021-05-11 16:13:37 +0100
e9cfd205f6 Remove unused drain Andrew Jeffery 2021-05-11 16:13:22 +0100
a5dee2867c Add debug to edits struct Andrew Jeffery 2021-05-11 16:13:08 +0100
9ace8892f6 Remove unchanged diff Andrew Jeffery 2021-05-11 12:48:45 +0100
12c90b1cbd Refactor travis to have more jobs Andrew Jeffery 2021-05-11 11:17:39 +0100
e92188104f

Ensure that ChangeBytes::compressed contains the original compressed bytes (#112) alexjg 2021-05-11 10:33:12 +0100
560a1c3381

Bump lodash from 4.17.20 to 4.17.21 in /automerge-backend-wasm (#119) dependabot[bot] 2021-05-11 10:21:33 +0100
77bf71e5ec Move bytes into decompress check Andrew Jeffery 2021-05-11 10:20:50 +0100
765c5287d7

Add event handler logic (#116) Andrew Jeffery 2021-05-11 10:15:37 +0100
6050f39d46 Change patch diffs to start with mapdiff Andrew Jeffery 2021-05-11 09:20:59 +0100
a512728649 Fix expansion of multi delete Andrew Jeffery 2021-05-11 08:38:09 +0100
d2005aef09

Bump lodash from 4.17.20 to 4.17.21 in /automerge-backend-wasm dependabot[bot] 2021-05-11 03:53:13 +0000
4caa9798d6 Don't skip props Andrew Jeffery 2021-05-10 23:43:59 +0100
497f554b02 Fix bug in expanded op iterator logic and add tests Andrew Jeffery 2021-05-10 23:25:46 +0100
59a24081d2 Switch to expanded_op more Andrew Jeffery 2021-05-10 19:25:43 +0100
d794ad4dd5 Update diffedit naming of fields and add comments Andrew Jeffery 2021-05-10 13:19:48 +0100
9c522cb587 Handle collapsing inserts in edits Andrew Jeffery 2021-05-10 12:27:28 +0100
ad8fbed477 Pass functions through rather than making field pub Andrew Jeffery 2021-05-07 20:31:44 +0100
d35488c030 Check index on remove_handler Andrew Jeffery 2021-05-07 20:31:30 +0100
7a08c52dac

Fix clippy (#118) Andrew Jeffery 2021-05-07 17:07:41 +0100
d2834e4f8e Add docs for enum variants Andrew Jeffery 2021-05-07 16:32:57 +0100
625039bb14 Remove partialeq Andrew Jeffery 2021-05-07 16:31:54 +0100
a38e72951e Fix clippy Andrew Jeffery 2021-05-07 16:20:50 +0100
a05f025fa3 Update Cargo.nix Andrew Jeffery 2021-05-07 14:53:39 +0100
ef96a88a7c flake.lock: Update Andrew Jeffery 2021-05-07 14:52:31 +0100
24ce85f109 Allow travis to fail on beta Andrew Jeffery 2021-05-07 14:16:48 +0100
a80a7ac2d4 Add docs and use id Andrew Jeffery 2021-05-07 13:42:51 +0100
98c39ca167 Add event handlers Andrew Jeffery 2021-05-07 13:11:11 +0100
9fb8666028

Merge pull request #107 from automerge/encode-ref Andrew Jeffery 2021-05-07 12:01:51 +0100