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

Mono Color

• e6e8184430 feat: add mark_saved feat/add-difference_0.3.0 ThetaDev 2023-03-13 18:43:56 +0100
• ce5287da3e feat: add mark_saved feat/add-difference ThetaDev 2023-03-13 18:43:56 +0100
• cb1fb40a04 feat: add change difference ThetaDev 2023-03-13 15:39:08 +0100
• b72d749b23 feat: add change difference ThetaDev 2023-03-13 15:39:08 +0100
• b8014f0efe
  Merge f951632f8c into cb409b6ffe Andrew Jeffery 2023-03-12 09:40:24 -0500
• 865f32b616
  Merge a307889352 into cb409b6ffe Sunil Pai 2023-03-12 01:10:44 +0000
• a307889352 Add support for cloudflare workers Sunil Pai 2023-03-12 01:08:38 +0000
• ec4fd11710
  Merge 83a8499559 into 271d5cbead Orion Henry 2023-03-11 15:09:00 +0000
• 83a8499559 merge fix diff Orion Henry 2023-03-11 09:08:55 -0600
• 30b4f1d02e
  Fix lifetimes on list_range_at diff_at Alex Good 2023-03-11 00:47:19 +0000
• c3ceda48e9 first attempt at an api Orion Henry 2023-03-10 18:23:00 -0600
• 4990ca9223 first draft of diff() api Orion Henry 2023-03-09 23:14:15 -0600
• 5f6b0e00be first draft of diff() api Orion Henry 2023-03-09 23:14:15 -0600
• 2b6112e2c5
  Merge 271d5cbead into cb409b6ffe Orion Henry 2023-03-10 10:57:19 -0800
• 271d5cbead cleanup based on alex's comments marks_port Orion Henry 2023-03-10 12:57:13 -0600
• aa0fdc7d2d Merge remote-tracking branch 'origin/main' into marks_port Orion Henry 2023-03-10 12:06:58 -0600
• 39f7bda290
  Merge 6779036a22 into cb409b6ffe Will Thompson 2023-03-10 16:23:47 +0000
• 6779036a22
  README: Remove stray ] Will Thompson 2023-03-10 16:23:19 +0000
• e879ee426e
  Merge 7307850ff3 into cb409b6ffe Andrew Jeffery 2023-03-10 11:44:48 +0000
• 7307850ff3 Fix wrong index Andrew Jeffery 2023-03-10 11:44:36 +0000
• 9cd9b16df2 Make hash_for_opid available during transactions Andrew Jeffery 2023-03-10 10:57:30 +0000
• e0fff0fa8d Add hash_for_opid function Andrew Jeffery 2023-03-10 10:26:15 +0000
• cb409b6ffe
  docs: timestamp -> time in automerge.change examples (#548) main alexjg 2023-03-09 18:10:23 +0000
• c19a26f9ec
  docs: timestamp -> time in automerge.change examples Alex Good 2023-03-09 17:48:05 +0000
• dc23f8753d deploy: b34b46fa16 gh-pages alexjg 2023-03-09 15:11:59 +0000
• b34b46fa16
  smaller automerge c (#545) Conrad Irwin 2023-03-09 08:09:43 -0700
• 57349112cd Generate significantly smaller automerge-c builds Conrad Irwin 2023-03-07 16:29:53 -0700
• de396d6ae9 Fix automerge-c tests on mac Conrad Irwin 2023-03-07 20:50:50 -0700
• f951632f8c Add external clock Andrew Jeffery 2023-03-07 17:13:32 +0000
• 5adca457cc Update flake inputs Andrew Jeffery 2023-03-07 17:36:59 +0000
• 9b0be6ec73 deploy: 7b747b8341 alexjg 2023-03-07 16:51:39 +0000
• 7b747b8341
  Error instead of corrupt large op counters (#543) Conrad Irwin 2023-03-07 09:49:04 -0700
• c75fd27dbc
  Merge b7415d18eb into 2c1970f664 Orion Henry 2023-03-06 23:25:33 -0700
• 092b011335 Error instead of corrupt large op counters Conrad Irwin 2023-03-02 22:18:06 -0700
• 3cde7f524c deploy: 2c1970f664 alexjg 2023-03-04 12:11:05 +0000
• 024708df01
  Merge c09923d51f into 2c1970f664 Eric Charles 2023-03-04 12:09:17 +0000
• 2c1970f664
  Fix panic on invalid action (#541) Conrad Irwin 2023-03-04 05:09:08 -0700
• 99498010ae deploy: 63b761c0d1 alexjg 2023-03-03 22:44:41 +0000
• 63b761c0d1
  Suppress clippy warning in parse.rs + bump toolchain (#542) christine betts 2023-03-03 17:42:40 -0500
• 4807684104 Bump toolchain to 1.67.0 christine betts 2023-03-03 15:48:44 -0500
• cc7803243a Fix rust error in parse.rs christine betts 2023-03-03 13:34:58 -0500
• f5f4bcb6c3 Fix panic on invalid action Conrad Irwin 2023-03-02 20:35:25 -0700
• c09923d51f add default export to wasm package.json Eric Charles 2023-03-02 10:12:00 +0100
• c38d9e883e add unmark() and marks() to unstable api Orion Henry 2023-03-01 10:54:28 -0600
• 2f4cf7b328 enable load callback test Orion Henry 2023-02-28 18:52:26 -0600
• 1c28e9656a add get_marks_at() Orion Henry 2023-02-28 17:17:14 -0600
• 8e818910d1 Merge remote-tracking branch 'origin/main' into marks_port Orion Henry 2023-02-28 13:28:28 -0600
• ba491c6f72 move wasm observer into automerge Orion Henry 2023-02-27 17:40:12 -0600
• b009fa6d60 deploy: 44fa7ac416 alexjg 2023-02-27 20:14:05 +0000
• 44fa7ac416
  Don't panic on missing deps of change chunks (#538) Conrad Irwin 2023-02-27 13:12:09 -0700
• 1a539a3d79 add unmark / remove spans/raw_spans/attr Orion Henry 2023-02-27 12:33:55 -0600
• 76538ea536 deploy: 8de2fa9bd4 alexjg 2023-02-25 18:48:45 +0000
• 8de2fa9bd4
  C API 2 (#530) Jason Kankiewicz 2023-02-25 10:47:00 -0800
• 91519020a7 Added and improved Doxygen markup. Jason Kankiewicz 2023-02-25 10:26:07 -0800
• d0bf324bc2 Better handle change chunks with missing deps Conrad Irwin 2023-02-01 22:07:50 -0700
• 1169ebdff0 Fix doubly-reported ops in load of change chunks Conrad Irwin 2023-02-24 22:07:52 -0700
• af9b006bb0 marks name->key, range->start,end, patch callback propogates expceitons and has heads Orion Henry 2023-02-24 16:50:19 -0600
• 01c721e640 remove a fixme Orion Henry 2023-02-24 13:54:41 -0600
• 3beccfb5ee track mark data by reference Orion Henry 2023-02-24 13:38:10 -0600
• 9a6840392e let insert take a conflict flag Orion Henry 2023-02-24 12:26:11 -0600
• d7d2c29dc7
  Merge branch 'main' into marks_port Orion Henry 2023-02-24 09:59:19 -0800
• 2c6e54390b rewrote observe_current_state - added get_marks() api call - cleaned up js interface Orion Henry 2023-02-24 00:04:01 -0600
• b7498875ae Replace libc::memcpy() calls with assignments. Fixed minor omission in the README. Improved index field documentation. Jason Kankiewicz 2023-02-24 05:46:37 -0800
• d7f93c5aca get mark patches working on load Orion Henry 2023-02-23 17:17:18 -0600
• a19097073c Renamed AMstrcmp() to AMstrCmp() for consistency with AMactorIdCmp(). Jason Kankiewicz 2023-02-23 05:55:05 -0800
• 0e0ea4f7ad Changed AMitemKey() to return its value through an "out" parameter. Changed AMitemPos() to return its value through an "out" parameter. Added documentation to the generated config.h file. Jason Kankiewicz 2023-02-23 00:01:52 -0800
• caab172ca3 Corrected AMitemToDoc() usage within the README. Jason Kankiewicz 2023-02-22 04:56:20 -0800
• 0b1bca3bae Renamed AMerrorMessage() to AMresultError() for @ConradIrwin in #530. Jason Kankiewicz 2023-02-21 22:20:00 -0800
• 2a9f996e68 Renamed AMfree() to AMresultFree() for @ConradIrwin in #530. Jason Kankiewicz 2023-02-21 22:03:24 -0800
• 6a5526c2f3 Made various changes for @alexjg in #530. Jason Kankiewicz 2023-02-20 08:44:00 -0800
• 84b7b82a43 Changed AMlistPutObject() to return an AMitem struct with an AM_VAL_TYPE_OBJ_TYPE value instead of an AM_VAL_TYPE_VOID value for @ConradIrwin in #530. Changed AMmapPutObject() to return an AMitem struct with an AM_VAL_TYPE_OBJ_TYPE value instead of an AM_VAL_TYPE_VOID value for @ConradIrwin in #530. Jason Kankiewicz 2023-02-20 03:09:37 -0800
• 3129b4bf35 Fixed a couple of formatting violations. Jason Kankiewicz 2023-02-20 01:39:11 -0800
• 5b16038844 Added a unit test case for AMbytes(). Added a unit test case for AMstr(). Added a unit test case for AMstrcmp(). Added a unit test case for AMstrdup(). Added unit test cases for the generated AM...ToString() functions. Added unit test cases for the generated AM...FromString() functions. Fixed AMstrdup(). Ported AMstrcmp() from C to Rust so that it would be in the core bindings. Made the result of calling AMbytes(NULL, ...) safe. Added the Cargo-built core bindings to the install target. Added descriptions for the utility headers. Fixed a typo in the documentation for AMsyncStateEncode(). Jason Kankiewicz 2023-02-20 01:35:22 -0800
• cb7c5f63be Fixed stupid bug in AMstrcmp() for @ConradIrwin in #530. Jason Kankiewicz 2023-02-17 02:17:29 -0800
• f66b212ccb Changed the AMitemTo...() functions to return the value through an out parameter for @ConradIrwin in #530. Jason Kankiewicz 2023-02-17 02:16:14 -0800
• e1d81e01fc mark patch callbacks and js mark api Orion Henry 2023-02-16 19:35:39 -0600
• b15f123990
  Merge 95f52b3cea into 407faefa6e Alex Currie-Clark 2023-02-15 21:22:41 +0000
• adde8744c1 deploy: 407faefa6e alexjg 2023-02-15 09:24:58 +0000
• 407faefa6e
  A few setup fixes (#529) Philip Schatz 2023-02-15 03:23:02 -0600
• a47cd21147 Add deno js release files js/automerge-2.0.2 actions 2023-02-15 00:20:38 +0000
• 1425af43cd @automerge/automerge@2.0.2 Alex Good 2023-02-14 19:47:53 +0000
• bc4f633577 remove redundant operation Philip Schatz 2023-02-05 16:46:34 -0600
• 9d61b1d776
  @automerge/automerge@2.0.2 Alex Good 2023-02-14 19:47:53 +0000
• 2bbd0b0477 Add deno js release files js/automerge-2.0.2-alpha.2 actions 2023-02-14 18:31:24 +0000
• 6e379d567b Add deno release files js/automerge-wasm-0.1.25 actions 2023-02-14 18:17:15 +0000
• c92d042c87 @automerge/automerge-wasm@0.1.24 and @automerge/automerge@2.0.2-alpha.2 Alex Good 2023-02-14 17:25:25 +0000
• c6a32d8368 Correct logic when skip = B and fix formatting Alex Good 2023-02-14 16:24:25 +0000
• a9612371e0 rework how skip works to push the logic into node Orion Henry 2023-02-13 21:17:27 -0600
• e2bb0eb6b9 Use our leb128 parser for values Conrad Irwin 2023-01-17 14:51:02 -0700
• 02e8ae2c70 Remove nightly from CI Alex Good 2023-02-09 11:06:08 +0000
• c91a2e36cc
  @automerge/automerge-wasm@0.1.24 and @automerge/automerge@2.0.2-alpha.2 Alex Good 2023-02-14 17:25:25 +0000
• 06101100aa deploy: 9271b20cf5 alexjg 2023-02-14 17:24:00 +0000
• 9271b20cf5 Correct logic when skip = B and fix formatting Alex Good 2023-02-14 16:24:25 +0000
• 5e82dbc3c8 rework how skip works to push the logic into node Orion Henry 2023-02-13 21:17:27 -0600
• 467c51f8f1
  Correct logic when skip = B and fix formatting Alex Good 2023-02-14 16:24:25 +0000
• 391aaff6b6 rework how skip works to push the logic into node Orion Henry 2023-02-13 21:17:27 -0600
• a006a32e3f get tests passing + unmark Orion Henry 2023-02-12 15:38:30 -0600
• 2ca520cd32 Update the CMake files to their actual minimum required version. Add a missing include to test/cmocka_utils.h. Jason Kankiewicz 2023-02-11 18:18:05 -0800
• 6c99ce7e93 Restore the ability to build after the automerge.h header has been removed. Jason Kankiewicz 2023-02-11 09:32:03 -0800
• 6c2fd22798 Restore the previous version specification for the cbindgen crate. Jason Kankiewicz 2023-02-11 09:06:11 -0800