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

c135b02a48 full document compression Orion Henry 2021-01-29 17:55:59 -0500
24dcd9c1e6 Add automerge change CLI op Alex Good 2021-01-29 14:16:52 +0000
ae4b9f8f94 Add some benchmarks and make some performance related tweaks Alex Good 2021-01-25 13:44:11 +0000
82deb8a517 fix succ/pred bugs on doc uncompress Orion Henry 2021-01-22 15:32:36 -0500
ddb7090f2c Merge branch 'main' of github.com:automerge/automerge-rs into main Orion Henry 2021-01-22 13:52:45 -0500
9a90a8f84c add full document decompression Orion Henry 2021-01-20 11:20:03 -0500
20bbe7c8b0 Run cargo fmt Alex Good 2021-01-20 15:48:04 +0000
8142d42796 Add first crdt benchmark and some frontend optimisations Alex Good 2021-01-19 14:21:03 +0000
b1a57566f3 Refactored javascript into JavaScript saki-osive 2021-01-19 22:10:55 +0530
8516476db2 Fix handling of Unchanged diffs in StateTreeValue::new_from_diff Alex Good 2021-01-19 14:55:54 +0000
56750f68d1 Fix inserts at beginning of a text object Alex Good 2021-01-19 14:20:09 +0000
c45d055ce3 Fix clippy Alex Good 2021-01-16 17:55:30 +0000
497372db99 Immutable frontend rewrite Alex Good 2020-11-22 18:26:28 +0000
4f61f7da08 simplified encoding code - 1 less copy Orion Henry 2021-01-14 15:23:42 -0500
cd6d83ef6d removed an unnecessarry round trip from the change encoder Orion Henry 2021-01-14 14:25:53 -0500
d11a0f6b73 fix extra_bytes serialization w field missing Orion Henry 2021-01-14 12:28:44 -0500
7cd1a059f5 Add proptest for serialization Alex Good 2021-01-14 17:07:32 +0000
3c4d64c8a0 Add extra_bytes Alex Good 2021-01-13 18:02:48 +0000
3187afcc51 Use more expressive Operation structure Alex Good 2021-01-13 17:40:11 +0000
b6d6b66c06 UncompressedChange moved packages Orion Henry 2021-01-12 14:12:49 -0500
ce38f5360b Move automerge_backend::UnencodedChange -> automerge_protocol::UncompressedChange Alex Good 2021-01-13 13:22:51 +0000
05fc4126cf fix extra_bytes serialization w field missing Orion Henry 2021-01-14 12:28:44 -0500
2c3f088644 Add proptest for serialization Alex Good 2021-01-14 17:07:32 +0000
d521521709 Add extra_bytes Alex Good 2021-01-13 18:02:48 +0000
f4d0e29560 Use more expressive Operation structure Alex Good 2021-01-13 17:40:11 +0000
e99ab6e3b4 UncompressedChange moved packages Orion Henry 2021-01-12 14:12:49 -0500
a3bd0a79d6 Move automerge_backend::UnencodedChange -> automerge_protocol::UncompressedChange Alex Good 2021-01-13 13:22:51 +0000
c859b24a12 fix c api Orion Henry 2021-01-12 15:33:10 -0500
0b469640d4 update format-tweaks to serialize properly Orion Henry 2021-01-12 12:12:46 -0500
4f9e07a29d Allow extra bytes at the end of a change Martin Kleppmann 2021-01-07 21:10:26 +0000
1350b3e4be Move index of columns ahead of the column data Martin Kleppmann 2021-01-07 16:02:25 +0000
fae835343f Require strictly monotonically increasing column IDs Martin Kleppmann 2021-01-07 15:32:50 +0000
13b3faf921 Move deps closer to the start of an encoded change Martin Kleppmann 2021-01-07 11:54:28 +0000
5ec8408398 Replace all-zeros UUID with '_root' Martin Kleppmann 2021-01-07 11:23:30 +0000
ec327c0125 Delete unused code Martin Kleppmann 2021-01-07 11:23:18 +0000
55de690542 UncompressedChange moved packages Orion Henry 2021-01-12 14:12:49 -0500
b8a56d9812 update format-tweaks to serialize properly Orion Henry 2021-01-12 12:12:46 -0500
50f6aad528 Move automerge_backend::UnencodedChange -> automerge_protocol::UncompressedChange Alex Good 2021-01-11 18:30:06 +0000
d320ba8b23 Allow extra bytes at the end of a change Martin Kleppmann 2021-01-07 21:10:26 +0000
adae99c513 Move index of columns ahead of the column data Martin Kleppmann 2021-01-07 16:02:25 +0000
fc99c3281a Require strictly monotonically increasing column IDs Martin Kleppmann 2021-01-07 15:32:50 +0000
9e2d3b1180 Move deps closer to the start of an encoded change Martin Kleppmann 2021-01-07 11:54:28 +0000
f9781b9557 Replace all-zeros UUID with '_root' Martin Kleppmann 2021-01-07 11:23:30 +0000
85bac8def9 Delete unused code Martin Kleppmann 2021-01-07 11:23:18 +0000
83145b82c4 add getHeads() and new deps functionality Orion Henry 2021-01-01 17:39:44 -0500
f3049202a7 update api to localChange Orion Henry 2020-12-30 15:27:07 -0500
2019a2bd1a update c api to undo api changes Orion Henry 2020-12-17 20:53:15 -0500
b8d71f3b53 remove undo/redo Orion Henry 2020-12-17 19:13:05 -0500
939ccf38aa adding ack function Orion Henry 2020-11-12 11:03:44 -0500
1d126dd263 faster max_op calc Orion Henry 2020-11-10 12:21:19 -0500
0a5e39b5fa wip Peter van Hardenberg 2020-11-09 15:30:31 -0800
d5b49316e7 wip Orion Henry 2020-11-09 18:11:49 -0500
d8d24e23a5 remove extra clone Orion Henry 2020-11-09 14:23:24 -0500
d03abd7457 fmt Orion Henry 2020-11-09 09:50:27 -0500
c2768c5ebc refactor process_request to feed the ops in one at a time removing the dobule list management ops Orion Henry 2020-11-03 15:23:59 -0500
39add00bf9 fxbuildhasher Orion Henry 2020-11-01 17:33:41 -0500
26a5d05fe2 copy2 changes Orion Henry 2020-10-28 14:45:14 -0400
cb33262a34

remove old build scripts (#32) Jeremy Rose 2020-11-08 06:48:00 -0800
f1032e6342

add link to instructions for installing wasm-pack (#31) Jeremy Rose 2020-11-08 06:47:40 -0800
f80c395434

cargo fmt --all (#30) Jeremy Rose 2020-11-08 06:47:18 -0800
023f3c1672

fix automerge-cli ftbfs (#29) Jeremy Rose 2020-11-08 06:47:00 -0800
6810b77010 use module syntax in bundler bootstrap Jeremy Rose 2020-11-06 09:15:14 -0800
2923d01712 package for node and bundler Jeremy Rose 2020-11-05 22:13:29 -0800
804b933064 remove old build scripts Jeremy Rose 2020-11-05 15:18:04 -0800
1797502971

add link to instructions for installing wasm-pack Jeremy Rose 2020-11-04 22:37:10 -0800
0765159da4 cargo fmt --all Jeremy Rose 2020-11-04 22:32:43 -0800
34bad18fd9 fix automerge-cli ftbfs Jeremy Rose 2020-11-04 22:30:42 -0800
a584e202f1 adding getMissingDeps and getChanges to C API Orion Henry 2020-09-09 13:46:00 -0400
c1319e06eb patch has a slightly different format now Orion Henry 2020-09-09 12:52:25 -0400
783f615a23 update to use new format for encoding key=_head Orion Henry 2020-09-08 16:53:07 -0400
fb3b56112c update binary encoding for op actions to match js implementation Orion Henry 2020-09-08 16:29:24 -0400
128e90bb18

cli: Add mutation CLI subcommands to IDEAS documentation (#25) Scott Trinh 2020-06-10 06:09:59 -0400
bbab9e641b cli: Add mutation CLI subcommands to IDEAS documentation Scott 2020-06-09 11:16:02 -0400
b943c41e7d

cli: Add import command (#21) Scott Trinh 2020-06-08 15:01:55 -0400
5e2d74d13e Remove debug message Scott 2020-06-08 15:00:18 -0400
08d79fefe0 cli: Move duct to dev-dependencies Scott 2020-06-08 14:58:04 -0400
c96e3e6a85

Update badges in README (#24) John Rees 2020-06-08 12:10:02 +0100
4a01aee7bf

Update Travis CI badge and link url in README John Rees 2020-06-08 12:09:04 +0100
581ea15ff2

Use shields.io for crates.io badge in README John Rees 2020-06-08 12:05:25 +0100
93b9072cf1 cli: Remove a few redundant calls to clone Scott 2020-06-07 11:59:44 -0400
7d4c6de217 cli: EOF NL Scott 2020-06-07 11:50:27 -0400
d3ea81fcfc cli: Add basic CLI tests for import, export, and import -> export Scott 2020-06-07 11:48:47 -0400
be39b669bd cli: comment-out println that was showing up in output files Scott 2020-06-07 11:48:18 -0400
93b35fb6de Merge branch 'master' into cli-import-json Scott 2020-06-07 09:40:57 -0400
59396f0944 cli: Add duct crate for testing Scott 2020-06-07 09:39:58 -0400
ce75f5e29e add a deserializer for message Orion Henry 2020-06-05 17:48:51 -0400
fbc70ba0e3 UnencodedChange.message is a required field according to typescript - default to emptystring Orion Henry 2020-06-05 17:07:33 -0400
d53eae1e94 add change encode and decode to the API Orion Henry 2020-06-05 12:03:38 -0400
1ef10f6450 Remove unnecessary in tests Alex Good 2020-06-04 14:59:19 +0100
80409879e0 More clippy shenanigans Alex Good 2020-06-04 14:51:24 +0100
7585a9d7a1 Run clippy on nightly Alex Good 2020-06-04 10:30:27 +0100
f5195fc25f run clippy Alex Good 2020-06-04 00:35:46 +0100
adfa722146 Merge branch 'master' of github.com:automerge/automerge-rs Alex Good 2020-06-04 00:32:50 +0100
d7560d88ed Start making errors more descriptive Alex Good 2020-06-04 00:32:18 +0100
2cf2835e76 Make Patch::clock keys ActorID rather than String Alex Good 2020-05-30 01:44:00 +0100
62345c2b5f Make Patch::actor an ActorID, not a string Alex Good 2020-05-30 01:24:26 +0100
a36a364443 Rename automerge_protocol::Value -> ScalarValue Alex Good 2020-05-29 21:04:29 +0100
617e09811a cli: Allow specifying an input file for import Scott 2020-05-26 21:49:04 -0400
40ef2c0fab cli: Small documentation fixes Scott 2020-05-26 21:40:04 -0400
85f3fbe938 cli: Align naming of the binary changes file, whether in or out Scott 2020-05-26 21:38:24 -0400