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

fa9361f780

Rename Sequence to List (#218) Andrew Jeffery 2021-07-13 16:27:48 +0100
4ed49ef29a Rename Sequence to List Andrew Jeffery 2021-07-13 14:29:21 +0100
c23ad91263 Update readme sections mentioning performance branch Andrew Jeffery 2021-07-13 14:22:51 +0100
01300d42a7

Add is_* and extraction methods to Value and Primitive (#213) Andrew Jeffery 2021-07-13 14:07:49 +0100
94162fc15f

Fix logic for updating changed_indices in diffable sequence (#203) Andrew Jeffery 2021-07-13 12:04:49 +0100
635339bd6d

Reorder wasm-pack args (#216) Andrew Jeffery 2021-07-13 12:02:54 +0100
262e273ee4 Reorder wasm-pack args Andrew Jeffery 2021-07-13 12:00:48 +0100
2c400bdbab Use tinyvec for actor id Andrew Jeffery 2021-06-18 11:00:40 +0100
5ed638e785 Add tests for diffable sequence changed_indices Andrew Jeffery 2021-07-01 16:21:56 +0100
dc2e191429 Fix logic for updating changed_indices Andrew Jeffery 2021-07-01 14:45:36 +0100
990d2bb4f3

Reduce deflate compression on the hot path (#186) Andrew Jeffery 2021-07-13 11:04:39 +0100
7fe5a3abf0 Rename chapter and improve format docs Andrew Jeffery 2021-07-09 09:22:25 +0100
33063e8428 Add make target for serving the book Andrew Jeffery 2021-07-08 23:15:41 +0100
5f0baf2adc Clean up and add more links to binary docs Andrew Jeffery 2021-07-08 23:14:44 +0100
c002648e57 Add some initial docs for the binary format Andrew Jeffery 2021-07-08 23:12:07 +0100
22a37fc4d3 Add is_* and extraction methods to Value and Primitive Andrew Jeffery 2021-07-08 10:32:13 +0100
5cb9d27e19 merge with main Orion Henry 2021-07-06 13:14:05 -0700
d312409a69

Travis.org -> Travis.com (#211) Andrew Jeffery 2021-07-06 17:21:58 +0100
c9e228ad83 Travis.org -> Travis.com Andrew Jeffery 2021-07-06 16:03:54 +0100
5e99648b36

diffable seq: Box Vector contents (#210) Andrew Jeffery 2021-07-06 13:40:57 +0100
e5bc05fed0 diffable seq: Box Vector contents Andrew Jeffery 2021-07-05 22:49:57 +0100
834c3c3393 Avoid going through the queue when loading load-avoid-queue Andrew Jeffery 2021-07-05 17:51:24 +0100
a033e4ed05

load: Reduce intermediate collects and use iterators more (#208) Andrew Jeffery 2021-07-05 17:27:55 +0100
5c5b3da836 load: Reduce intermediate collects and use iterators more Andrew Jeffery 2021-07-04 12:48:59 +0100
3ca5c68151

load: Don't generate a patch that will just be dropped (#209) Andrew Jeffery 2021-07-05 17:22:23 +0100
64114b901d

Check heads when decoding a document (#207) Andrew Jeffery 2021-07-05 17:22:06 +0100
6bc01a3b37 load: Don't generate a patch that will just be dropped Andrew Jeffery 2021-07-04 12:55:06 +0100
b05d6e690a

Add cards example. (#198) David Craven 2021-07-05 17:22:06 +0200
c7b5244683 Use default. David Craven 2021-07-05 16:54:25 +0200
6484fc9d67 Check heads when decoding a document Andrew Jeffery 2021-07-04 11:57:00 +0100
e71f6964a4 Use static_assertions to test for Send+Sync remove-event-handlers Andrew Jeffery 2021-07-04 10:23:12 +0100
066c955370 Remove event handlers Andrew Jeffery 2021-07-04 10:04:51 +0100
9dcafaeac4 Remove queue from backend Andrew Jeffery 2021-07-03 23:02:18 +0100
db0055510a Seal EventHandler trait Andrew Jeffery 2021-07-03 22:17:13 +0100
c2fff80867 Expose EventHandler Andrew Jeffery 2021-07-03 22:15:48 +0100
ad003b2122 Add sendable backend Andrew Jeffery 2021-07-03 19:24:59 +0100
a55ea62c66

Return an error to the user when trying to delete a non-existent key (#204) Andrew Jeffery 2021-07-01 16:09:58 +0100
70f99fc010 Add tests for deleting a missing key Andrew Jeffery 2021-07-01 16:04:10 +0100
5d42e50798

Generic actor (#202) David Craven 2021-07-01 16:49:35 +0200
da869eaa35 Return an error to the user when trying to delete a non-existent key Andrew Jeffery 2021-07-01 15:42:06 +0100
7dece93144 Fix tests and benches. David Craven 2021-07-01 16:38:39 +0200
ae2b74f66b No reason to force usage of uuid's. David Craven 2021-07-01 15:15:03 +0200
6fa80ac77f Enable logging. David Craven 2021-07-01 15:11:58 +0200
a3ed2b244f Make the features additive Andrew Jeffery 2021-06-30 22:48:59 +0100
825df8034d Add feature to automerge Cargo.toml Andrew Jeffery 2021-06-30 22:46:36 +0100
20ad290d38 Add send feature flag Andrew Jeffery 2021-06-30 22:35:05 +0100
0ff841f2b9 Fix the rest Vedant Roy 2021-06-30 07:47:48 -0400
942627c11b

Update nix (#200) Andrew Jeffery 2021-06-29 17:52:38 +0100
c515a1b794 Update Cargo.nix Andrew Jeffery 2021-06-29 17:45:30 +0100
2b3bd9c0e0 Improve flake nix to always use Cargo.nix info Andrew Jeffery 2021-06-29 17:45:09 +0100
41c0872d68 Automatically compress changes in C apis Andrew Jeffery 2021-06-29 17:37:25 +0100
5397026060 Automatically compress changes in wasm interface Andrew Jeffery 2021-06-29 17:28:24 +0100
01159056ef

Add dev command for building wasm backend (#199) Andrew Jeffery 2021-06-29 17:12:24 +0100
7c7fae0dad Compress changes before sending in sync Andrew Jeffery 2021-06-24 18:26:17 +0100
13d5f9c438 Make map values bigger in perf bin Andrew Jeffery 2021-06-24 18:21:23 +0100
58a2814c0e Move compression to function of Change Andrew Jeffery 2021-06-24 17:22:14 +0100
6334393631 Bump sha256 Andrew Jeffery 2021-06-24 15:52:52 +0100
fb990c622e Separate out building wasm Andrew Jeffery 2021-06-29 14:24:03 +0100
4e0faaefbb Add dev command for building wasm backend Andrew Jeffery 2021-06-29 13:58:26 +0100
ae62ba9d0f Fix comments. David Craven 2021-06-29 14:07:48 +0200
2edf3bc4a4 Use pointer Vedant Roy 2021-06-29 01:32:19 -0400
ff9f884b5a Add example. David Craven 2021-06-28 19:52:34 +0200
78dc394a7a

Fix ambiguous key deserialization (#197) Andrew Jeffery 2021-06-28 18:09:18 +0100
76699defc6 Fix ambiguous key deserialization Andrew Jeffery 2021-06-28 14:35:50 +0100
3db6f9ef13

Fix Clippy issues, broken tests, formatting issues (#188) Orion Henry 2021-06-28 05:20:21 -0700
ccac31e183 Ensure SortedVec sorts on deserialize Andrew Jeffery 2021-06-27 14:59:38 +0100
a2c9f180a1 Fix clippy needless-borrow Andrew Jeffery 2021-06-26 17:35:39 +0100
a4c41e5e36 Fix Err prefix clippy error Andrew Jeffery 2021-06-26 17:34:57 +0100
b861054dac Add smol_str arbitrary Andrew Jeffery 2021-06-26 17:26:56 +0100
a190bce535 Bump travis nvm version Andrew Jeffery 2021-06-26 17:20:31 +0100
49ad037ec6 fix clippy errors Orion Henry 2021-06-25 17:35:33 -0400
b4829ede72

Add makefile for ease of use (#194) Andrew Jeffery 2021-06-28 13:02:32 +0100
6f40c716f0 Add makefile for ease of use Andrew Jeffery 2021-06-28 09:22:10 +0100
cf42e72662

Add building docs to CI (#192) Andrew Jeffery 2021-06-28 12:59:39 +0100
49e4aae673

Don't document automerge-c-v2 due to name clash (#191) Andrew Jeffery 2021-06-28 12:58:07 +0100
14d92e513c

Stop non-empty needs repeating messages (#193) Andrew Jeffery 2021-06-27 14:59:23 +0100
7fa17691aa Stop non-empty needs repeating messages Andrew Jeffery 2021-06-26 19:45:54 +0100
992e9c3036 Add building docs to CI Andrew Jeffery 2021-06-26 17:16:21 +0100
cee056af93 Don't document automerge-c-v2 due to name clash Andrew Jeffery 2021-06-26 17:05:52 +0100
cddb3eae7c Update smol_str Andrew Jeffery 2021-06-26 16:52:13 +0100
4e685cc36a Tidy up arbitrary features Andrew Jeffery 2021-06-26 08:44:05 +0100
16cbb0a1c3 Update examples + comment Vedant Roy 2021-06-26 01:18:01 -0400
c62a0b9c32 Update comments Vedant Roy 2021-06-26 01:11:14 -0400
5cb28b5353 Round trip (msgpack) on patches/changes works Vedant Roy 2021-06-26 01:09:01 -0400
a001350ede Add Python script to check mpack files Vedant Roy 2021-06-25 21:15:26 -0400
16ae4a032e Update example gen script Vedant Roy 2021-06-25 21:08:08 -0400
892d356001 Fix interop script Vedant Roy 2021-06-25 12:57:32 -0400
b307781c8a Try different commit hash Vedant Roy 2021-06-25 12:32:32 -0400
2e1ab65d1d Make benches compile Vedant Roy 2021-06-25 12:17:07 -0400
e606937fa0 Update interop tests + review comment Vedant Roy 2021-06-25 12:11:42 -0400
132fa001fc Address review comments Vedant Roy 2021-06-25 11:58:30 -0400
ca638691d0 Tests pass after rebase Vedant Roy 2021-06-25 11:45:52 -0400
aecfcf2c87 Rebase + clippy Vedant Roy 2021-06-18 11:25:39 -0400
bf3d2447aa throw a proper error on change decode Orion Henry 2021-06-10 09:55:54 -0400
bb83460c44 Remove bad file Vedant Roy 2021-06-10 01:56:55 -0400
338ec28992 Satisfy clippy Vedant Roy 2021-06-10 01:55:37 -0400
b82463bb87 Tests pass Vedant Roy 2021-06-10 01:48:29 -0400
a3a9d0b1fb condense_insert_ops failing Vedant Roy 2021-06-10 01:27:15 -0400
14031addd3 Encode Vec<ScalarValue> into type system as ScalarValues Vedant Roy 2021-06-08 15:33:10 -0400
9353ae40b2 Remove F32 Vedant Roy 2021-06-08 12:23:43 -0400