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

1e6038c3d7 Change ActorID::to_string -> ActorID::to_hex_string to avoid clashes with Display Alex Good 2020-05-10 14:06:55 +0100
b63864dae3 Move ActorID into lib.rs Alex Good 2020-05-10 14:05:49 +0100
1839348109 Remove pub export automerge_protocol:{..} from automerge-backend Alex Good 2020-05-10 14:00:38 +0100
8e8bee7fa1 Move Patch,Diff etc Alex Good 2020-05-10 13:57:51 +0100
f910845def Move Operation Alex Good 2020-05-10 13:42:23 +0100
21f3bec8ba Move Operation Alex Good 2020-05-10 13:35:33 +0100
45346d9617 Move Operation::{generate_redos, can_merge, and merge} to to backend.rs Alex Good 2020-05-10 13:24:19 +0100
4bd3f912c4 Move OpType Alex Good 2020-05-10 13:17:46 +0100
12c3ade5ab Move OpRequest, ReqOpType, and RequestKey Alex Good 2020-05-10 13:12:30 +0100
873c9791a1 Move resolve_key to backend.rs Alex Good 2020-05-10 12:59:42 +0100
fdc044d284 Move DataType and Value Alex Good 2020-05-10 12:50:57 +0100
7ee984a80d Move ElementID and Key Alex Good 2020-05-10 02:03:16 +0100
d37617b9a1 Move object ID Alex Good 2020-05-10 01:46:43 +0100
de0b05540e Move opid Alex Good 2020-05-10 01:37:40 +0100
2e28e2c01e Move ObjType Alex Good 2020-05-10 01:22:04 +0100
a8c1fb7ba1 Move ChangeHash to protocol crate Alex Good 2020-05-10 01:08:04 +0100
7b8a0ec6c9 Move ActorID Alex Good 2020-05-09 20:02:48 +0100
dd650b0c38 Merge branch 'performance' into frontend Alex Good 2020-05-09 13:04:44 +0100
e3fe5b9d6d One more passing test Alex Good 2020-05-08 00:24:34 +0100
6ad3e13fc0 Tests passing with optimistic local diff application Alex Good 2020-05-07 16:02:02 +0100
c45351b121 first cut of the C api Orion Henry 2020-05-07 07:57:34 -0700
c6b6d59aa1 bugfix in RLE encode/decode Orion Henry 2020-05-06 10:31:50 -0700
0223433a36 WIP Alex Good 2020-05-05 20:12:42 +0100
bddccbe8fd tests passing for the new deps/hash api Orion Henry 2020-05-05 10:34:18 -0700
eebcee91dc patch refactor Orion Henry 2020-05-02 16:12:12 -0700
a5b0492c36 key/value/diff refactor Orion Henry 2020-04-29 14:47:13 -0700
bb881a373d added all the number types Orion Henry 2020-04-27 18:52:45 -0700
2c599d49d6 get tests working again Orion Henry 2020-04-27 14:22:04 -0700
65b2a056ac WIP Alex Good 2020-04-27 19:38:32 +0100
74b9ecbcfe fmt Orion Henry 2020-04-27 10:53:18 -0700
c7874cc849 encoding in - tests passing Orion Henry 2020-04-22 11:51:42 -0700
ba44d3a717 set_stdio Orion Henry 2020-04-21 20:15:56 -0700
f58e2ffb4f clean up decoder trait Orion Henry 2020-04-21 17:32:10 -0700
15b7bb8c60 Make a CLI out of an enmormous pile of hacks Alex Good 2020-04-22 00:35:10 +0100
d05b9db6d0 Merge branch 'performance' into frontend Alex Good 2020-04-21 23:32:24 +0100
eca8af0d04 Add text rendering with no tests Alex Good 2020-04-21 23:32:02 +0100
43d14194d3

Loading initial state sans text Alex Good 2020-04-21 23:17:36 +0100
e601f8c7d1 light cleanup Orion Henry 2020-04-21 13:20:25 -0700
fa125e94c5 clean up js errors Orion Henry 2020-04-21 13:08:00 -0700
eaa023e219 now taking arrays of binary changes as intended Orion Henry 2020-04-21 11:58:07 -0700
d855ab9283 decode binary changes Orion Henry 2020-04-20 12:21:50 -0700
13e8e01a79 use dynamic key resolver Orion Henry 2020-04-18 08:05:05 -0700
dbbf53cc55 reduce cloning with versions Orion Henry 2020-04-17 15:06:05 -0700
4f11bb8baa lots of little cleanup and micro ops in skip list Orion Henry 2020-04-17 10:06:10 -0700
6c70182ecd light cleanup Orion Henry 2020-04-17 08:50:24 -0700
bef7a9d4cc fix tests Orion Henry 2020-04-17 08:26:47 -0700
b2a2394647 orderedmap to orderedset Orion Henry 2020-04-17 08:20:01 -0700
586a7e179e performance experiment with ord deltas Orion Henry 2020-04-17 07:50:23 -0700
e3203b24d9

Update GOALS_AND_ISSUES.md Orion Henry 2020-04-16 11:31:08 -0400
68c593dda7 cleanup readme Orion Henry 2020-04-16 08:11:12 -0700
d2aec176d9 goals and issues markdown Orion Henry 2020-04-16 08:06:24 -0700
fe38f41569 integrate skiplist into backend Orion Henry 2020-04-16 06:07:40 -0700
2180f4ac46 cleanup Orion Henry 2020-04-13 21:27:32 -0700
f6da533b99 cleanup Orion Henry 2020-04-13 21:14:36 -0700
50ec30bdba added skip list - not used yet Orion Henry 2020-04-13 20:21:50 -0700
be39105ec9

Merge pull request #13 from automerge/remove-object-id-str Orion Henry 2020-04-13 11:58:30 -0700
0d885b2e79 Merge branch 'remove-object-id-str' into frontend Alex Good 2020-04-13 19:23:45 +0100
1fefbd029e Run clippy Alex Good 2020-04-13 19:23:32 +0100
ebfc71a2f7 Merge branch 'remove-object-id-str' into frontend Alex Good 2020-04-13 19:20:01 +0100
d173aa3b1b Remove ObjectID::Str and add some standard trait impls Alex Good 2020-04-13 19:02:34 +0100
1ad7dc9187 WIP Alex Good 2020-04-13 19:03:06 +0100
0e5bcb2999 Remove ObjectID::Str Alex Good 2020-04-13 19:02:34 +0100
344cfb2a9d WIP Alex Good 2020-04-13 18:24:19 +0100
161cd1c827 WIP Alex Good 2020-04-13 16:39:30 +0100
3f8c8d097e

Merge pull request #12 from automerge/backend-tests Orion Henry 2020-04-13 07:19:08 -0700
bcbff29c0a

Run cargo fmt Alex Good 2020-04-10 19:12:42 +0100
fe9873f66b

Tiny README fix Alex Good 2020-04-10 19:09:31 +0100
02de5f6c8a

Run clippy Alex Good 2020-04-10 19:07:44 +0100
33e25f776d

Don't change wasm stuff yet Alex Good 2020-04-10 18:57:28 +0100
9daf1053e6

Formatting and clippy Alex Good 2020-04-10 18:55:59 +0100
0ed6586a04 Port backend tests Alex Good 2020-04-10 18:54:13 +0100
ce856d4213 wip Alex Good 2020-04-10 17:23:09 +0100
948ca78a8b Run cargo fmt Alex Good 2020-04-10 14:36:26 +0100
5fbc23fd75 Cleanup, add deserialization for DiffLink Alex Good 2020-04-10 14:36:12 +0100
94a50fe68a webpack sync inline stuff Orion Henry 2020-04-08 15:33:16 -0700
c5916f97b7 start work on async build Orion Henry 2020-04-06 13:43:50 -0700
41eea0bb02 grab readme from performance branch Orion Henry 2020-04-05 10:39:42 -0700
f37f65dd08 tools for making an asmjs version Orion Henry 2020-04-05 10:22:45 -0700
2d7190394d Let the test suite specify the encode/decode functions Martin Kleppmann 2020-04-02 21:38:44 +0100
7b51847026 Refactor wrapper to correspond more closely to JS backend Martin Kleppmann 2020-04-02 21:07:20 +0100
88c96cfc8d Allow building without rimraf dependency Martin Kleppmann 2020-04-02 20:57:17 +0100
86844cd43a move files back to old names Orion Henry 2020-04-02 13:12:23 -0700
06b234c889 prep for npm package Orion Henry 2020-04-02 12:37:52 -0700
4911b5df53 update yarn deps Orion Henry 2020-04-02 09:44:49 -0700
7233b23d86 Merge branch 'wip' of github.com:automerge/automerge-rs into wip Orion Henry 2020-04-02 09:41:27 -0700
95cb760f79 added clock to patch, some packaging cleanup Orion Henry 2020-04-02 09:39:41 -0700
80a2e75e86 Add clock to all patches Martin Kleppmann 2020-04-02 17:12:35 +0100
f9142d6a1a

Merge pull request #11 from ept/wip Orion Henry 2020-04-02 06:52:17 -0700
74bfee8770 Fix getChanges/getMissingChanges function confusion Martin Kleppmann 2020-04-02 14:48:29 +0100
989e9e0e66 Update to match Automerge performance branch Martin Kleppmann 2020-04-02 13:01:47 +0100
a85798cb8e try immutable data structures - move serde to its own file Orion Henry 2020-03-31 19:16:46 -0700
3642e990e3 some simple optimizations Orion Henry 2020-03-31 15:54:41 -0700
af34d7ef36 move undo stack and clock out of opset Orion Henry 2020-03-31 06:49:47 -0700
461c970e30 light edits Orion Henry 2020-03-30 16:45:28 -0700
f8aa3e2fd5 Reduce memory overhead for versions Orion Henry 2020-03-30 16:04:24 -0700
ccd90c1e61 version.rc<op_set> Orion Henry 2020-03-30 15:27:09 -0700
fca6e1c09e move things out of op_set that are not needed Orion Henry 2020-03-30 15:15:30 -0700
9eed955d18 keep a cache of elemids in the object Orion Henry 2020-03-30 14:32:38 -0700
f7b3a57d20 handle insert remove properly in diffs - preserve undo stack Orion Henry 2020-03-30 08:42:25 -0700
f97e36f770 linked diffs dont need to be remapped Orion Henry 2020-03-29 23:58:23 -0700