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

• 5e3a4621d3 deploy: 964ae2bd81 alexjg 2023-01-14 11:29:07 +0000
• 964ae2bd81
  Fix SeekOpWithPatch on optrees with only internal optrees (#496) alexjg 2023-01-14 11:27:48 +0000
• d11a22bf71
  Fix SeekOpWithPatch on optrees with only internal optrees Alex Good 2023-01-14 10:58:52 +0000
• d8df1707d9
  Update rust toolchain for "linux" step Alex Good 2023-01-14 11:06:58 +0000
• 3b9ee5cc5e Add deno js release files js/automerge-2.0.1-alpha.4 actions 2023-01-13 10:48:37 +0000
• 681a3f1f3f
  Add github action to deploy deno package Alex Currie-Clark 2023-01-12 07:04:40 +0000
• 362e1e7572 Re-enable release on push Alex Currie-Clark 2023-01-12 17:33:15 +0000
• b162077181 Test without bumping any version numbers Alex Currie-Clark 2023-01-12 17:32:12 +0000
• cdb42e9469 Update deno_tests ci script so that it runs on the js files too Explicitly include version when building js deno files add comment to deno uuid file Alex Currie-Clark 2023-01-12 17:28:15 +0000
• 39428e5a0f Bump version Alex Currie-Clark 2023-01-12 16:38:04 +0000
• f0bdd83d33 Add always to js publish alongside other conditions rotate version to test Alex Currie-Clark 2023-01-12 16:37:46 +0000
• 6a1e50f43c Bump version to test action Alex Currie-Clark 2023-01-12 16:33:37 +0000
• 78791ebb3a correction for yaml comparison Alex Currie-Clark 2023-01-12 16:32:23 +0000
• 590d967c87 First pass at a deno release script for js Alex Currie-Clark 2023-01-12 16:31:15 +0000
• 5a90956e3b Updates to file formatting Alex Currie-Clark 2023-01-12 15:19:08 +0000
• 12f445d55d Updated typescript files in preparation for deno builds Alex Currie-Clark 2023-01-12 14:50:31 +0000
• 4ffe4d6238 Add denoify, a deno smoke test and add deno specific uuid implementation Alex Currie-Clark 2023-01-12 07:06:29 +0000
• 7768a66696 Update js type imports and exports to explicitly register as types Alex Currie-Clark 2023-01-12 07:04:40 +0000
• f8ed7e53f2 Add deno release files js/automerge-wasm-0.1.21 actions 2023-01-12 13:04:13 +0000
• 22e9915fac automerge-wasm: publish release build in Github Action Alex Good 2023-01-12 12:32:53 +0000
• e58e3d4b97
  automerge-wasm: publish release build in Github Action Alex Good 2023-01-12 12:32:53 +0000
• 2d8df12522
  re-enable version check for WASM release Alex Good 2023-01-12 11:35:48 +0000
• 28849ed9dc Add deno release files js/automerge-wasm-0.1.20 actions 2023-01-12 11:21:52 +0000
• f073dbf701
  use setup-node prior to attempting to publish in release action Alex Good 2023-01-12 11:04:22 +0000
• 5c02445bee
  Bump automerge-wasm, again Alex Good 2023-01-12 10:39:11 +0000
• 3ef60747f4
  Roll back automerge-wasm to test release action Alex Good 2023-01-12 10:37:11 +0000
• d12bd3bb06
  correctly call npm publish in release action Alex Good 2023-01-12 10:27:03 +0000
• a0d698dc8e
  Version bump js and wasm Alex Good 2023-01-12 09:55:12 +0000
• 93a257896e Release action: Fix for check that WASM version has been updated before publishing Alex Currie-Clark 2023-01-11 20:08:45 +0000
• ed3165edc0 Release action: Fix for check that WASM version has been updated before publishing Alex Currie-Clark 2023-01-11 20:08:45 +0000
• 95b4707c07 deploy: 9c3d0976c8 alexjg 2023-01-11 17:21:17 +0000
• 9c3d0976c8 Add workflow to generate a deno.land and npm release when pushing a new automerge-wasm version to #main Alex Currie-Clark 2023-01-11 16:00:03 +0000
• ca145eba1c Add workflow to generate a deno.land and npm release when pushing a new automerge-wasm version to #main Alex Currie-Clark 2023-01-11 16:00:03 +0000
• 32451b4669
  automerge-rs: Add ExId::to_bytes Alex Good 2023-01-04 09:58:12 +0000
• 7ccb9ec460 deploy: 1ca1cc38ef orionz 2023-01-10 17:17:53 +0000
• 1ca1cc38ef
  Merge pull request #484 from automerge/text2-compat Orion Henry 2023-01-10 09:16:22 -0800
• 0e7fb6cc10
  javascript: Add @packageDocumentation TSDoc Alex Good 2023-01-10 11:49:16 +0000
• c540acefe5 deploy: 18a3f61704 alexjg 2023-01-10 12:53:56 +0000
• d1220b9dd0
  javascript: Use glob to list files in package.json Alex Good 2023-01-10 11:25:06 +0000
• 6c0d102032
  automerge-js: Add backwards compatibility text layer Alex Good 2022-12-22 09:17:10 +0000
• 5763210b07
  wasm: Allow a choice of text representations Alex Good 2022-12-21 17:42:33 +0000
• 18a3f61704 Update rust toolchain to 1.66 Alex Good 2023-01-10 12:14:30 +0000
• 87e017cf32
  Update rust toolchain to 1.66 Alex Good 2023-01-10 12:14:30 +0000
• 3f6a0def9d
  Bump json5 from 1.0.1 to 1.0.2 in /javascript/examples/create-react-app dependabot[bot] 2023-01-09 10:54:06 +0000
• c90335885f deploy: 0306ade939 alexjg 2023-01-06 15:25:14 +0000
• 0306ade939 Update action name on IncPatch type Alex Currie-Clark 2023-01-06 12:47:23 +0000
• ad386c7b01 Update action name on IncPatch type Alex Currie-Clark 2023-01-06 12:47:23 +0000
• 0537ae5878 Return an error from automerge-c on empty commit Conrad Irwin 2022-12-22 13:27:54 -0700
• 1e7dcdedec automerge-js: Add prettier Alex Good 2022-12-22 12:03:49 +0000
• 493b744b09
  automerge-js: Add prettier Alex Good 2022-12-22 12:03:49 +0000
• 8a645bb193 js: Enable typescript for the JS tests Alex Good 2022-12-22 09:59:16 +0000
• b06e0059bb
  js: Enable typescript for the JS tests Alex Good 2022-12-22 09:59:16 +0000
• e61e46e1da deploy: 4de0756bb4 alexjg 2022-12-20 20:39:59 +0000
• 4de0756bb4 Correctly handle ops on optree node boundaries Alex Good 2022-12-18 20:21:26 +0000
• ce4edaa64e
  Correctly handle ops on optree node boundaries Alex Good 2022-12-18 20:21:26 +0000
• 14ed16c94d deploy: d678280b57 alexjg 2022-12-19 16:32:02 +0000
• d678280b57 automerge-cli: Add an examine-sync command Alex Good 2022-12-19 11:33:12 +0000
• f682db3039 automerge-cli: Add a flag to skip verifiying heads Alex Good 2022-12-19 11:08:02 +0000
• 6da93b6adc Correctly implement colored json Alex Good 2022-12-19 10:52:45 +0000
• 0f90fe4d02 Add a method for loading a document without verifying heads Alex Good 2022-12-19 10:43:56 +0000
• f4da20223b
  automerge-cli: Add an examine-sync command Alex Good 2022-12-19 11:33:12 +0000
• 1a97ed943c
  automerge-cli: Add a flag to skip verifiying heads Alex Good 2022-12-19 11:08:02 +0000
• 3fbaaa22a5
  Correctly implement colored json Alex Good 2022-12-19 10:52:45 +0000
• adcd04cefb
  Add a method for loading a document without verifying heads Alex Good 2022-12-19 10:43:56 +0000
• 0975c5614b add a POC redis sync class redis Orion Henry 2022-12-13 19:51:22 -0600
• 8aff1296b9
  automerge-cli: remove a bunch of bad dependencies (#478) alexjg 2022-12-14 18:06:19 +0000
• a5ebe65758 deploy: 6dad2b7df1 alexjg 2022-12-14 17:37:21 +0000
• 6dad2b7df1
  Don't panic on invalid gzip stream (#477) Conrad Irwin 2022-12-14 10:34:22 -0700
• 20daf851e0
  Merge pull request #1 from automerge/fix-decompress-nits Conrad Irwin 2022-12-14 10:19:05 -0700
• daafb77df2
  automerge-cli: remove a bunch of bad dependencies Alex Good 2022-12-14 16:58:54 +0000
• 338a33b5d3 deploy: e75ca2a834 alexjg 2022-12-14 11:44:47 +0000
• e75ca2a834
  Update README.md (Update Slack invite link) (#475) patryk 2022-12-14 12:41:21 +0100
• 84b8cffbfa
  Add an associated error type to Direction fix-decompress-nits Alex Good 2022-12-14 11:13:42 +0000
• 09df2867e1 Don't panic on invalid gzip stream Conrad Irwin 2022-12-13 22:02:40 -0700
• a8ce638d6d
  Update README.md (Update Slack invite link) patryk 2022-12-13 16:37:43 +0100
• 3229548fc7
  update js dependencies and some lint errors (#474) Orion Henry 2022-12-11 13:26:00 -0800
• 8982085623 update js dependencies and some lint errors Orion Henry 2022-12-11 13:31:25 -0600
• a96f77c96b
  Merge pull request #458 from automerge/dependabot/npm_and_yarn/javascript/examples/create-react-app/loader-utils-2.0.4 Orion Henry 2022-12-11 11:36:38 -0800
• cbafe5180f deploy: b78211ca65 alexjg 2022-12-11 18:59:13 +0000
• b78211ca65
  change opid to (u32,u32) - 10% performance uptick (#473) Orion Henry 2022-12-11 10:56:20 -0800
• ebe1e2a39c change opid to (u32,u32) - 10% performance uptick Orion Henry 2022-12-11 12:12:59 -0600
• e47b508533 deploy: 1222fc0df1 alexjg 2022-12-10 10:38:34 +0000
• 1222fc0df1
  rewrite opnode to store usize instead of Op (#471) Orion Henry 2022-12-10 02:36:05 -0800
• 321eda937d rewrite opnode to store usize instead of Op Orion Henry 2022-12-07 15:14:15 -0600
• b7415d18eb adding a badmessage performance case payloadtest badmessage Orion Henry 2022-12-09 17:44:07 -0600
• f594022538 deploy: 2db9e78f2a alexjg 2022-12-09 23:53:21 +0000
• 2db9e78f2a
  Text v2. JS Api now uses text by default (#462) Orion Henry 2022-12-09 15:48:07 -0800
• dc7d7f9ffd Text v2. JS Api now uses text by default patch api heavily updated to allow several concurrency/patch bugs fixed throw errors if ops are used on the wrong type (map,list,text) the patch callback is called once with all patches utf16 support for javascript performance work remove Text class Orion Henry 2022-11-04 10:11:34 -0500
• b05c9e83a4
  Use AMbyteSpan for AM{list,map}PutBytes (#464) Conrad Irwin 2022-12-09 09:11:23 -0700
• a8b2c92f60 deploy: c3932e6267 alexjg 2022-12-09 13:48:46 +0000
• c3932e6267
  Improve docs for building automerge-c on a mac (#465) Conrad Irwin 2022-12-09 06:46:23 -0700
• 75d4240e70 Add cross-compilation instructions Conrad Irwin 2022-12-08 08:38:30 -0700
• 0dd1b858a0 implement utf16 mode for slice/patch rebase-text2 Orion Henry 2022-12-01 11:31:14 -0600
• 3049bcae19
  Re-alphabetized the AutomergeError variants. Jason Kankiewicz 2022-11-30 23:30:25 -0800
• 835f9d839f
  Fixed a clippy violation. Jason Kankiewicz 2022-11-30 23:29:55 -0800
• 1a1dd2ede6
  Aligned the failing automerge-c unit test cases with "TextV2" behavior for @orionz. Jason Kankiewicz 2022-11-30 23:29:28 -0800
• 9e4e2a7570
  the patch callback is called once with all patches Orion Henry 2022-11-28 14:35:28 -0600
• c584a229e0
  throw errors if ops are used on the wrong type (map,list,text) - this broke several tests as it makes all the api uses more strict Orion Henry 2022-11-28 00:36:19 -0600
• 3940972dd8
  add an error message for splicing non-text objects Orion Henry 2022-11-27 19:30:16 -0600
• 9b7abcb28a
  make doc accessable from observer functions - prep work for fixing the expose issue Orion Henry 2022-11-27 19:01:52 -0600