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

d6c7200b22 Add getAllChanges to wasm backend Martin Kleppmann 2021-04-02 16:52:32 +0100
74c27751f1 Remove getChangesForActor from wasm backend Martin Kleppmann 2021-04-02 16:51:09 +0100
f6b3964733 backend: remove unecessary draining of changes to apply. Gregory 2021-04-01 12:28:13 +0800
a81a37dfb4 backend: remove unecessary draining of changes to apply. Gregory 2021-04-01 12:28:13 +0800
19782f38ac Document delta encoder and decoder Andrew Jeffery 2021-04-01 00:02:53 +0100
3b60375696 Update boolean encoder and decoder to use u32 instead of usize Andrew Jeffery 2021-03-31 23:53:36 +0100
906e5af2b1 Update RleState to use u32 and i32 Andrew Jeffery 2021-03-31 23:38:33 +0100
433334ffc3 Update rle encoding and decoding Andrew Jeffery 2021-03-31 23:34:58 +0100
5cd4430717 Change Increment operation to use i64 Andrew Jeffery 2021-03-31 22:13:03 +0100
d3d1b48c48 Cleanup box on frontend Andrew Jeffery 2021-03-21 13:27:08 +0000
d17554dfc4 Remove rc on backend Andrew Jeffery 2021-03-29 21:08:22 +0100
f9513cf970

Fix benchmarks using text (#74) Andrew Jeffery 2021-03-31 10:41:08 +0100
20a4f20a83 Cleanup box on frontend Andrew Jeffery 2021-03-21 13:27:08 +0000
f5d30f300f Remove rc on backend Andrew Jeffery 2021-03-29 21:08:22 +0100
afd9ac22b4 CI: change --all to --all-targets Andrew Jeffery 2021-03-30 21:49:39 +0100
02e1a6b6cc Simplify if statement to remove unreachable case Andrew Jeffery 2021-03-26 14:11:52 +0000
8035b7342c Fix benchmarks using text Andrew Jeffery 2021-03-28 23:24:57 +0100
6257d74013 Simplify if statement to remove unreachable case Andrew Jeffery 2021-03-26 14:11:52 +0000
239fe59090

Use grapheme clusters in Text instead of char (#72) Andrew Jeffery 2021-03-28 21:32:03 +0100
3f5a781c71

Simplify while stack not empty (#68) Andrew Jeffery 2021-03-28 21:28:37 +0100
776aef660a

Fix alignment error on wasm32 (#71) Andrew Jeffery 2021-03-28 21:28:18 +0100
2f46719ec7

Add nightly to travis config (#69) Andrew Jeffery 2021-03-28 21:26:07 +0100
f5f89dd33f Simplify while stack not empty Andrew Jeffery 2021-03-27 19:50:37 +0000
21ea91acee Use debug_assert_eq instead of debug_assert Andrew Jeffery 2021-03-28 18:37:55 +0100
a41d820ae7 Add test for grapheme clusters in text Andrew Jeffery 2021-03-28 18:08:31 +0100
00ccdfa52a Use grapheme clusters in Text instead of char Andrew Jeffery 2021-03-28 18:02:42 +0100
257483792f Box im_rc::Vector contents to satisfy alignment Andrew Jeffery 2021-03-27 21:55:29 +0000
3598973838 Add wasm-pack test to ci Andrew Jeffery 2021-03-27 21:42:18 +0000
9afb6d944b Add failing alignment test case Andrew Jeffery 2021-03-27 21:40:30 +0000
afa02a38d8 Add nightly to travis config Andrew Jeffery 2021-03-26 10:53:44 +0000
82cf04ae49 Implement compression Alex Good 2021-03-26 13:57:35 +0000
ec87f411aa

Fix types in wasm/README.md (#66) Tyler Samples 2021-03-27 05:12:50 -0600
7ecab77c2d

Fix types in wasm/README.md Tyler Samples 2021-03-26 23:06:56 -0600
1e36b62272

Check the checksum in the document on decoding (#62) Andrew Jeffery 2021-03-26 13:59:03 +0000
921e9859b2

Fix issue in RleDecoder with null runs (#63) Andrew Jeffery 2021-03-26 13:57:08 +0000
ae3549d214 Specify reading rle len as i64 instead of isize Andrew Jeffery 2021-03-26 08:59:34 +0000
68ec117dac Update tests Andrew Jeffery 2021-03-26 00:36:20 +0000
4ec93969a6 Add a test case to check the repeated nulls issue in rle Andrew Jeffery 2021-03-26 00:25:34 +0000
126995c57e Specify to decode into usize in rle decoder Andrew Jeffery 2021-03-26 00:22:46 +0000
6a2a019dbe Update test case to not use empty strings in keys Andrew Jeffery 2021-03-25 23:58:21 +0000
a3646176ee Update test case Andrew Jeffery 2021-03-25 17:26:56 +0000
3492684d1f Add another failing test case for save_load Andrew Jeffery 2021-03-24 18:51:55 +0000
573da1d00c Add new case for save then load Andrew Jeffery 2021-03-24 18:28:13 +0000
9de798bc5b Update printing diff of changes Andrew Jeffery 2021-03-24 15:25:57 +0000
af3b4d6bbf Check the checksum in the document on decoding Andrew Jeffery 2021-03-26 00:26:10 +0000
19f079f58a Add test to check save and load works on failing input Andrew Jeffery 2021-03-24 13:58:17 +0000
69048791e1

Add nix config (#61) Andrew Jeffery 2021-03-24 18:15:18 +0000
a1686ee88d Update flake-utils input Andrew Jeffery 2021-03-24 17:35:24 +0000
237bdbe805 Add nix config Andrew Jeffery 2021-03-23 17:00:29 +0000
485356ca6c

Update travis config (#60) Andrew Jeffery 2021-03-23 21:25:43 +0000
7bb7291e28 Update travis badge Andrew Jeffery 2021-03-23 20:52:51 +0000
b81c5b809d Specify defaults for os and dist Andrew Jeffery 2021-03-23 20:49:22 +0000
73579e1575 travis: Add building wasm backend Andrew Jeffery 2021-03-23 17:30:17 +0000
477fbf20db

backend-wasm: Make yarn release work again (#59) Andrew Jeffery 2021-03-23 16:56:16 +0000
3c2857f59a backend-wasm: Make yarn release work again Andrew Jeffery 2021-03-23 16:30:59 +0000
823f868630 backend: Check predecessor exists Andrew Jeffery 2021-03-21 20:12:37 +0000
2cc7b60ccb

Update uuid (#52) Andrew Jeffery 2021-03-18 12:38:05 +0000
f90d05ce0b Update uuid Andrew Jeffery 2021-03-17 20:11:11 +0000
429b3ebf06

Nostd time (#51) Andrew Jeffery 2021-03-17 11:55:31 +0000
91eba29a5c frontend: Add new_with_timestamper Andrew Jeffery 2021-03-16 23:21:22 +0000
e6b78a640e frontend: Add std feature Andrew Jeffery 2021-03-16 23:18:42 +0000
c103b0638e Ritual abasement at the altar of clippy Alex Good 2021-03-02 19:35:00 +0000
4f4674a4a1 Implement cursors in frontend Alex Good 2021-02-13 18:12:29 +0000
59fc360f58 Merge branch 'main' of github.com:automerge/automerge-rs into main Orion Henry 2021-02-19 14:05:25 -0500
37f8778a81 reorg file for new package Orion Henry 2021-02-18 16:41:20 -0500
52c008788b Run rustfmt Alex Good 2021-02-15 15:42:59 +0000
29f29581e6 Fix build error and remove cargo cache from Travis Alex Good 2021-02-15 15:36:04 +0000
93d45c381d Run rustfmt Alex Good 2021-02-15 15:04:05 +0000
5f26ec0c5f Refactored javascript into JavaScript saki-osive 2021-01-19 22:10:55 +0530
33328796cd Remove mutable reference to actors in OpSet::finalize_diffs Alex Good 2021-02-09 15:45:13 +0000
08f324f7e6 Merge ref encoding/decoding and value encoding/decoding Alex Good 2021-02-09 13:55:12 +0000
9bfcaea477 Run rustfmt Alex Good 2021-02-08 16:06:41 +0000
26dfc7ea40 Implement cursor logic in backend Alex Good 2021-02-08 15:24:01 +0000
2d31952d77 Implement encoding and decoding of cursor operations Alex Good 2021-02-06 13:02:20 +0000
8f9d66d4f2 Add CursorDiff and serde impls Alex Good 2021-02-05 13:31:28 +0000
0b99082c67 Add Cursor data type and serde impls for it Alex Good 2021-02-05 13:12:22 +0000
3e72cf6df0 added cdylib to produce dynamic library Matt Ho 2021-02-11 17:41:10 -0600
6350a8726d trying new ways to package the wasm Orion Henry 2021-02-12 11:49:49 -0500
ef38e6d7da getting some WASM errors trying to access crypto in the browser - switching to SmallRng with a 0 seed for now - deterministic distribution of nodes in the skip list should be fine Orion Henry 2021-02-12 11:49:06 -0500
2c18e9299e

added cdylib to produce dynamic library Matt Ho 2021-02-11 17:41:10 -0600
99dd948941 Remove mutable reference to actors in OpSet::finalize_diffs Alex Good 2021-02-09 15:45:13 +0000
0a48ddc453 Merge ref encoding/decoding and value encoding/decoding Alex Good 2021-02-09 13:55:12 +0000
103b90b6ea Run rustfmt Alex Good 2021-02-08 16:06:41 +0000
9bf5bc9818 Implement cursor logic in backend Alex Good 2021-02-08 15:24:01 +0000
4df54157ce Implement encoding and decoding of cursor operations Alex Good 2021-02-06 13:02:20 +0000
634b73af14 Add CursorDiff and serde impls Alex Good 2021-02-05 13:31:28 +0000
cf74ce1bd8 Add Cursor data type and serde impls for it Alex Good 2021-02-05 13:12:22 +0000
f8b6228488 remove js wrapper code and move all module wrapper logic into rust Orion Henry 2021-02-04 16:23:15 -0500
b0fc259892 Run clippy and cargo fmt Alex Good 2021-02-03 16:39:38 +0000
740315cdc4 added get_last_local_change() Orion Henry 2021-02-02 15:16:45 -0500
78024fd000 add automerge_get_heads() and automerge_error() Orion Henry 2021-02-02 14:33:00 -0500
98015f5a9c Better formatting for cli docs Alex Good 2021-02-01 18:24:21 +0000
f79f632d35 remove raw string literal from c test program Orion Henry 2021-02-01 12:22:11 -0500
0c44edd919

fixed typos (#43) Matt Ho 2021-02-01 04:57:11 -0600
f5c7586efd fixed typos Matt Ho 2021-01-31 12:12:31 -0600
a28ae6edb6 Fix dependency encoding in document format Alex Good 2021-01-31 15:59:51 +0000
c34f771693 Add color to CLI Alex Good 2021-01-30 17:56:54 +0000
6affcae4d1 Document change command Alex Good 2021-01-30 12:46:56 +0000
db2d540cae zero length error Orion Henry 2021-01-29 17:59:57 -0500
d4a60dafc1 Merge branch 'main' of github.com:automerge/automerge-rs into main Orion Henry 2021-01-29 17:56:14 -0500