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

17f886936d unbreak tests Orion Henry 2020-02-27 16:15:54 -0500
8f47b8e0cf migrate to new changerequest format Orion Henry 2020-02-27 14:40:55 -0500
db9498c91c thorw error on duplicate change Orion Henry 2020-02-27 14:22:46 -0500
5063335b86 Modify WASM interface to use ChangeRequest for applyLocalChange Alex Good 2020-02-27 19:19:34 +0000
f4bd5d1984 Add ChangeRequest and associated serialization logic Alex Good 2020-02-27 19:17:58 +0000
ba937eab6d Merge branch 'master' of github.com:alexjg/automerge-rs Orion Henry 2020-02-27 13:41:16 -0500
d79ee1a06c applyLocalChange() v1 Orion Henry 2020-02-27 13:41:08 -0500
39b43477a9 Rename ObjectHistory -> ObjectState Alex Good 2020-02-27 18:07:50 +0000
79a6240cbc Remove commented out js in tests Alex Good 2020-02-27 18:05:20 +0000
2f0ed3ed09 Fix buggy simplifyDiffs, completing applyChanges implementation Alex Good 2020-02-27 18:03:48 +0000
952c4b4030 Add diff simplification Alex Good 2020-02-27 17:46:18 +0000
a0807bc2f8 Add delete sequence element test Alex Good 2020-02-27 17:14:23 +0000
20aa4d9bae Merge branch 'master' into more-diffs Alex Good 2020-02-27 16:42:48 +0000
6ae761d299 Fix list patch generation Alex Good 2020-02-27 16:42:32 +0000
da8e23dd7e Merge branch 'master' into more-diffs Alex Good 2020-02-26 18:16:36 +0000
693aa8a6bb strip out Orion Henry 2020-02-26 13:07:48 -0500
eccc907cf2 WIP Alex Good 2020-02-26 18:07:45 +0000
0c2152ba57 migrated back to jsvalue::serde - fixed conflicts:[] Orion Henry 2020-02-26 12:29:34 -0500
3754e537c4 simple test not passing Orion Henry 2020-02-26 09:30:21 -0500
f1afb83f7d List insert tests passing Alex Good 2020-02-26 14:23:57 +0000
a16c5e02b6 Add elemId to InsertSequenceElement Alex Good 2020-02-26 13:45:25 +0000
5eb5329653 Merge branch 'master' into diff-generation Alex Good 2020-02-25 19:44:18 +0000
1b73a2a4ac Add some diff generation tests Alex Good 2020-02-25 19:36:53 +0000
f45edb3dbe Add conflict generation Alex Good 2020-02-25 18:53:52 +0000
cd8af1a10a Run clippy Alex Good 2020-02-25 18:13:41 +0000
f2450330d9 Run fmt Alex Good 2020-02-25 17:55:25 +0000
fe862a9fe6 Some very simple diffs being generated Alex Good 2020-02-25 17:54:13 +0000
bfc89cf0d4 Broken WIP Alex Good 2020-02-21 14:56:03 +0000
ac5e02e63d test cleanup Orion Henry 2020-02-21 09:45:46 -0500
ae7884ecdd hand copy some tests from automerge - lets make them pass Orion Henry 2020-02-19 13:28:24 -0700
0b760fb21f simple cleanup Orion Henry 2020-02-19 12:52:13 -0700
28cf791aa7 Add error to backend type signatures Alex Good 2020-02-15 12:53:04 +0000
5e5747cc1e First diff generation working Alex Good 2020-02-15 12:45:18 +0000
194732d910 Run rustfmt Alex Good 2020-02-15 11:28:08 +0000
ca9e2ce429 Move backend into it's own module Alex Good 2020-02-15 11:27:42 +0000
cdbb98e080 Move patch into it's own module Alex Good 2020-02-15 11:25:45 +0000
79cc50b55e Move core logic into backend crate Alex Good 2020-02-15 11:22:00 +0000
ff505e1468 Add deserialization, fixes #2 Alex Good 2020-02-14 19:35:28 +0000
47904467cd Add serialization tests for diffs Alex Good 2020-02-14 14:19:19 +0000
a328b91a18 Move custom serde to separate module Alex Good 2020-02-14 13:04:51 +0000
c29992113a Merge branch 'master' into diffs Alex Good 2020-02-14 12:50:49 +0000
6a85cbb019 Merge branch 'master' of github.com:alexjg/automerge-rs Alex Good 2020-02-14 12:50:10 +0000
1ae9a70109 WIP Alex Good 2020-02-14 12:50:03 +0000
3f5dae3249 Merge branch 'master' into diffs Alex Good 2020-02-14 12:21:55 +0000
09c8f1ff76 migrate to serde-wasm-bindgen with result/error handling Orion Henry 2020-02-13 19:31:09 -0500
a898166119 Remove main_js Orion Henry 2020-02-13 19:17:18 -0500
43aab45e13 remove refcell and clone Orion Henry 2020-02-13 19:16:36 -0500
a0e3a433ca fix snake case Orion Henry 2020-02-13 18:59:10 -0500
a8e2b3943d bugfix with improper clone/into Orion Henry 2020-02-13 18:52:09 -0500
503244744c fix applyPatch tuple return type Orion Henry 2020-02-13 18:50:18 -0500
b3e6551355 Add patch and diff details Alex Good 2020-02-13 17:01:05 +0000
d6151e30dd added other wasm functions Orion Henry 2020-02-13 11:56:01 -0500
f41ea8d238 removed junk file Orion Henry 2020-02-13 11:41:14 -0500
f07c0bfe6d importing first pass at wasm-bindgen interface Orion Henry 2020-02-13 11:34:30 -0500
2afcd1bbb6 Stub out backend interface Alex Good 2020-02-13 13:28:44 +0000
4c428702f6 Create automerge-backend and automerge-wasm crates Alex Good 2020-02-13 11:45:32 +0000
357dc894ba Create workspace Alex Good 2020-02-13 11:42:28 +0000
0f1b585145 Fix readme Alex Good 2020-02-13 11:27:01 +0000
a286bbad8d Merge branch 'mutation' Alex Good 2020-02-13 00:06:25 +0000
f63ec5b6e2 Add some attempts at documentation Alex Good 2020-02-13 00:05:40 +0000
e812222e82 Run rustfmt Alex Good 2020-02-12 23:46:07 +0000
155b580fef First crack at mutation complete Alex Good 2020-02-12 23:45:53 +0000
dbbb4b1700 Split ObjectStore out of OpSet Alex Good 2020-02-12 22:53:33 +0000
e233a06204 Move change handling code to ChangeContext Alex Good 2020-02-11 22:22:55 +0000
3b944dfee7 Cache root value after every change Alex Good 2020-01-19 15:04:10 +0000
ece4ff9f98 run rustfmt Alex Good 2020-01-17 14:59:51 +0000
3b528f0c06 Don't directly use serde_json in document interface Alex Good 2020-01-17 14:50:58 +0000
a4332b8c1a Hacky insertion implementation Alex Good 2020-01-06 19:28:39 +0000
48a5973b75 More hacky implementations of move and delete mutations Alex Good 2020-01-06 17:55:19 +0000
32e18e1def Add very hacky set operation API Alex Good 2020-01-05 19:09:30 +0000
d6ed0d31de Fix crates link Alex Good 2019-12-30 00:03:32 +0000
8a309feb1d Add function to recursively create ops from values Alex Good 2019-12-29 02:45:58 +0000
adbbe0f2dc Rough out API for mutation Alex Good 2019-12-28 23:26:19 +0000
100b45e59f Handle missing clippy on nightly in travis.yml Alex Good 2019-12-28 17:36:33 +0000
95b63dd82d Add badges and dependency example to README Alex Good 2019-12-28 16:22:29 +0000
620c74c1a0 Rename to automerge v0.0.2 v0.0.1 Alex Good 2019-12-28 15:56:11 +0000
6613b1d580 Add clippy to travis Alex Good 2019-12-28 15:44:10 +0000
27f7bde2a3 Bump version Alex Good 2019-12-28 15:42:02 +0000
8637a2c045 Add module documentation Alex Good 2019-12-28 15:41:30 +0000
1f2682041e Only deploy stable Alex Good 2019-12-28 15:37:31 +0000
56d6535df5 Remove uuid dependency Alex Good 2019-12-28 15:29:58 +0000
10757d79b7 Add crates deploy integration Alex Good 2019-12-28 15:13:45 +0000
6d88ada48a Remove Skeptic Alex Good 2019-12-28 15:03:23 +0000
cc318404e4 Correct travis.yml filename Alex Good 2019-12-28 14:55:11 +0000
f2b5b91a10 Add travis Alex Good 2019-12-28 14:52:05 +0000
92d36b7245 Add skeptic to test README.md Alex Good 2019-12-28 14:40:27 +0000
614751108b Run rustfmt and clippy Alex Good 2019-12-28 14:29:38 +0000
9a7eab0564 Add metadata Alex Good 2019-12-28 13:36:08 +0000
ac3a02fe28 Change version Alex Good 2019-12-28 13:30:01 +0000
5bc3fcdf44 Add license Alex Good 2019-12-28 13:28:37 +0000
8e4a96575d Add readme Alex Good 2019-12-28 13:27:11 +0000
bb6daaa83e Basic read only implementation Alex Good 2019-12-22 12:19:42 +0000
4e88b7729a Operation deserialization Alex Good 2019-11-28 19:03:09 +0000