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

59e36cebe4 Improve transactions with drop, transact and better commit Andrew Jeffery 2022-02-17 11:07:59 +0000
930b9a850f Add a CI step to run the CMake build of the C bindings for @alexjg. Jason Kankiewicz 2022-02-14 14:38:00 -0800
3290492235 Add CMake instructions for @orionz. Jason Kankiewicz 2022-02-14 14:09:58 -0800
b62e2fcf96 Add CMake support. Jason Kankiewicz 2022-02-10 23:28:54 -0800
ec5fe444b9 Replace *intptr_t in C function signatures. Jason Kankiewicz 2022-02-10 22:49:53 -0800
62c71845cd Add some basic docs for Automerge mutations Andrew Jeffery 2022-02-16 15:12:51 +0000
e970854042 Fix benchmark ids Andrew Jeffery 2022-02-16 14:56:17 +0000
2f49a82eea Have generate_sync_message not take mut self Andrew Jeffery 2022-02-16 14:20:49 +0000
ea826b70f4 Move TransactionInner and add get methods to Transaction Andrew Jeffery 2022-02-16 14:15:36 +0000
7cbd6effb7 Add autotxn document for wasm and cross-language use Andrew Jeffery 2022-02-16 13:35:55 +0000
d7da7267d9 Initial wasm fix Andrew Jeffery 2022-01-19 15:27:15 +0000
735a4ab84c Add explicit transaction API Andrew Jeffery 2022-01-19 14:31:31 +0000
ef938fdf0a manually handle js types - make sure we have good errors Orion Henry 2022-02-15 14:02:19 -0500
6d2c8be16a Add a CI step to run the CMake build of the C bindings for @alexjg. Jason Kankiewicz 2022-02-14 14:38:00 -0800
163250cc03 Add CMake instructions for @orionz. Jason Kankiewicz 2022-02-14 14:09:58 -0800
dc74977e4c Add CMake support. Jason Kankiewicz 2022-02-10 23:28:54 -0800
dc6eecf4e8 Replace *intptr_t in C function signatures. Jason Kankiewicz 2022-02-10 22:49:53 -0800
06f0b201c9 Revert "remove marks" marks2 Orion Henry 2022-02-10 11:42:58 -0500
b6e0da28d8 fmt Orion Henry 2022-02-10 11:48:09 -0500
c8c695618b remove marks Orion Henry 2022-02-10 11:38:12 -0500
d1b0d41239 move marks into its own test Orion Henry 2022-02-10 11:17:15 -0500
9136f00e43 bugfix: duplicate seq not blocked on apply_changes, clone did not close a transaction, added fork and merge to wasm Orion Henry 2022-02-10 11:14:44 -0500
b53305cf7f Merge branch 'marks' into tmp Orion Henry 2022-02-10 09:42:38 -0500
98a65f98f7 Add failing test for decoding a conflicted merge Karissa McKelvey 2022-02-08 16:34:08 -0800
bbcdf85237 Add failing test for decoding a conflicted merge Karissa McKelvey 2022-02-08 16:34:08 -0800
c655427f9a

Add support for web rae 2022-02-07 16:33:10 -0800
1aab66d160 fix version number Orion Henry 2022-02-06 19:57:25 -0500
a9ddb9398c cleanup typescript defs Orion Henry 2022-02-06 19:01:37 -0500
851ec6c6d3 am_pop and am_pop_value Orion Henry 2022-02-06 18:59:19 -0500
d21bcb2579 Move CMake files out of the root folder for @orionz. Jason Kankiewicz 2022-02-05 05:43:32 -0800
ba038e5aa5 Add CMake support to resolve #264 Jason A. Kankiewicz 2022-01-23 23:08:35 -0800
3f82850e44 fix bug in set scalar Orion Henry 2022-02-04 20:15:57 -0500
c54aab66c4 better error on invalid value Orion Henry 2022-02-04 14:43:22 -0500
70c5fea968 Change rust flake to use default profile Andrew Jeffery 2022-02-04 16:58:48 +0000
df435b671f flake.lock: Update Andrew Jeffery 2022-02-04 16:56:38 +0000
7607ebbfcc Add from () for Value Andrew Jeffery 2022-02-04 11:37:33 +0000
17104686a2 break the ground Orion Henry 2022-02-03 19:43:36 -0500
bf184fe980 remove some un needed imports Orion Henry 2022-02-03 14:43:02 -0500
2019943849 bump edition from 2018 to 2021 Orion Henry 2022-02-03 14:38:21 -0500
0f49608dde spans have types not names Orion Henry 2022-02-02 16:29:23 -0500
1d0c54ca9a raw_spans with ids Orion Henry 2022-02-02 16:21:33 -0500
ee80837feb raw_spans experiment Orion Henry 2022-02-02 15:55:41 -0500
da73607c98 adding make Orion Henry 2022-01-31 17:45:07 -0500
e88f673d63 Revert "Remove make" Orion Henry 2022-01-31 17:43:56 -0500
5b9360155c Remove make Orion Henry 2022-01-31 17:28:24 -0500
17e6a9a955 fixed fixed Orion Henry 2022-01-31 17:24:46 -0500
1269a8951e use types in pkg Orion Henry 2022-01-31 17:24:17 -0500
836e6ba510 fix return types Orion Henry 2022-01-31 17:21:16 -0500
a9dec7aa0b remove dead code Orion Henry 2022-01-31 17:11:22 -0500
7b32faa238 all ts tests passing Orion Henry 2022-01-31 17:07:20 -0500
c49bf55ea4 almost working ts Orion Henry 2022-01-31 16:48:03 -0500
d3f4be0654 Fix typescript errors in test Karissa McKelvey 2022-01-31 13:03:27 -0800
831faa2589 uint datatypes & fix some more typescript errors Karissa McKelvey 2022-01-31 12:48:49 -0800
4c84ccba06 half done - not working typescript Orion Henry 2022-01-31 15:23:46 -0500
bfc051f4fb cleanup / rename Orion Henry 2022-01-28 12:37:35 -0500
a2e433348a mark encode/decode/serde Orion Henry 2022-01-28 12:24:58 -0500
b794f4803d rework marks as inserts between values Orion Henry 2022-01-27 08:49:44 -0500
e679c4f6a0 v0 wip Orion Henry 2022-01-25 19:19:51 -0500
a59ffebd64 Update app to include text editor, import Automerge correctly wasm-pkg karissa 2022-01-28 21:33:24 -0700
da36537264 Improve the react example react-example karissa 2022-01-31 10:50:37 -0700
e5df0e3c97 Update app to include text editor, import Automerge correctly karissa 2022-01-28 21:33:24 -0700
fa13c58cc7 new yarn.lock Orion Henry 2022-01-28 19:51:41 -0500
e85f47b1f4 remove from package.json Orion Henry 2022-01-28 18:58:47 -0500
2990f33803 remove tmp file Orion Henry 2022-01-28 18:07:08 -0500
9ff0c60ccb add cra example code Orion Henry 2022-01-28 18:05:33 -0500
cfa1067c19 rework wasm function to use js types more directly Orion Henry 2022-01-28 16:41:17 -0500
3393a60e59 clippy lint Orion Henry 2022-01-20 14:37:19 -0500
7b3db2f15a clippy lint Orion Henry 2022-01-20 14:25:25 -0500
54fec3e438 lamport compare was backward on actorids and so was value resolution Orion Henry 2022-01-20 13:16:01 -0500
fd3e7290f4 clippy lint Orion Henry 2022-01-20 14:37:19 -0500
a08f4bcc93 clippy lint Orion Henry 2022-01-20 14:25:25 -0500
157dadbcfe lamport compare was backward on actorids and so was value resolution Orion Henry 2022-01-20 13:16:01 -0500
0388c46480 Remove unused is_empty function on optrees Andrew Jeffery 2022-01-19 17:39:39 +0000
429426a693 Fix removal and rollback Andrew Jeffery 2022-01-19 17:32:57 +0000
2015428452 Detect object type before getting length Andrew Jeffery 2022-01-19 17:14:49 +0000
812c7df3a7 Add length tests to props tests Andrew Jeffery 2022-01-18 22:47:00 +0000
5867c8d131 Fixup CI Andrew Jeffery 2022-01-19 10:02:49 +0000
0ccf36fe49 Add test and doc update for setting scalarvalues Andrew Jeffery 2022-01-18 21:27:09 +0000
a12af10ee1 optimize js Orion Henry 2022-01-19 18:08:15 -0500
e0f3dc3b50 Remove unused is_empty function on optrees Andrew Jeffery 2022-01-19 17:39:39 +0000
b646bb5822 Fix removal and rollback Andrew Jeffery 2022-01-19 17:32:57 +0000
1d21f1d0d2 Fixup CI Andrew Jeffery 2022-01-19 10:02:49 +0000
c3af1eabb5 Detect object type before getting length Andrew Jeffery 2022-01-19 17:14:49 +0000
69ee5985d6 track obj type Orion Henry 2022-01-19 12:18:43 -0500
bbaadd86c3 Add length tests to props tests Andrew Jeffery 2022-01-18 22:47:00 +0000
0a6e034036 Fix length Andrew Jeffery 2022-01-19 16:58:36 +0000
56edfc040c Have object-specific functions take the narrower typed props Andrew Jeffery 2022-01-19 16:51:00 +0000
e1a6f596c9 Rename root function Andrew Jeffery 2022-01-19 15:31:58 +0000
bfeab9fc23 Rename valueref to view Andrew Jeffery 2022-01-19 15:30:15 +0000
45a0f14f55 Add historic value ref progress Andrew Jeffery 2022-01-19 13:45:40 +0000
7224f1d5f2 Add mutation for lists Andrew Jeffery 2022-01-19 13:19:57 +0000
12c7318552 Begin implementing mutable refs Andrew Jeffery 2022-01-19 11:51:13 +0000
17e6999d21 Allow chaining value_ref calls Andrew Jeffery 2022-01-19 10:48:13 +0000
711ad9b409 Fixup CI Andrew Jeffery 2022-01-19 10:02:49 +0000
728703146d Add test and doc update for setting scalarvalues Andrew Jeffery 2022-01-18 21:27:09 +0000
3dacb14ead Add initial value ref impl Andrew Jeffery 2022-01-18 22:49:37 +0000
faf3e2cae4 update todo Orion Henry 2022-01-18 12:40:48 -0500
8b2f0238f3 create sub op tree at a time when we know the type Orion Henry 2022-01-13 19:09:33 -0500
acbf394290 cleanup some dead code Orion Henry 2022-01-13 18:30:34 -0500
b30a2b9cc1 give Counter its own type Orion Henry 2022-01-13 18:23:39 -0500