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

9332ed4ad9

wip columnar-experiments Alex Good 2022-03-09 17:48:07 +0000
0cf54c36a8 0.0.21 Orion Henry 2022-03-17 19:15:21 -0400
b9b0f96357 Ensure CMake targets can be built after a clean. Jason Kankiewicz 2022-03-17 15:17:08 -0700
d565db1ea8 Prevent unnecessary updating of the generated header file. Jason Kankiewicz 2022-03-17 15:10:09 -0700
99b1127f5c Merge branch 'experiment' into marks Orion Henry 2022-03-17 14:42:35 -0400
d3647e75d3 Documented the AMObj.ID struct member. Jason Kankiewicz 2022-03-16 02:50:59 -0700
cc58cbf4bb Normalize the formatting of the AMobjType_tag() function. Jason Kankiewicz 2022-03-16 02:03:37 -0700
c2954dd2c7 Remove superfluous backslashes. Jason Kankiewicz 2022-03-16 02:02:03 -0700
bcb6e759a4 Removed the AMconfig() function. Implemented the AMgetActor() function. Added the AMgetActorHex() function. Added the AMsetActor() function. Added the AMsetActorHex() function. Jason Kankiewicz 2022-03-16 02:01:33 -0700
9b2c566b9e Added the "hex" and "smol_str" crate dependencies to the C API. Jason Kankiewicz 2022-03-16 01:50:31 -0700
99e06e1f73 Corrected a spelling error. Jason Kankiewicz 2022-03-16 01:06:15 -0700
9e1a063bc0 v20 - object replacement char Orion Henry 2022-03-14 14:47:12 -0400
ae87d7bc00 v20 - object replacement char Orion Henry 2022-03-14 14:47:12 -0400
629b19c71d Align backslashes. Jason Kankiewicz 2022-03-13 20:30:54 -0700
09d25a32b7 Add EOF linefeed. Jason Kankiewicz 2022-03-13 20:30:23 -0700
4ed14ee748 Fix "fmt" CI job violations. Jason Kankiewicz 2022-03-13 20:05:30 -0700
f53b40625d Merge branch 'c_api_exp' of https://github.com/automerge/automerge-rs into c_api_exp Jason Kankiewicz 2022-03-13 16:34:11 -0700
7d5538d8a4 Updated the C API's unit test suite. Jason Kankiewicz 2022-03-13 16:31:22 -0700
335cd1c85f Removed superfluous AMobj traits. Jason Kankiewicz 2022-03-13 16:27:39 -0700
420f8cab64 Moved the AMobj struct into the result module. Changed the AMobj struct into an enum. Added the AMbyteSpan struct. Added the AMvalue enum. Added the AMresult::Nothing variant. Jason Kankiewicz 2022-03-13 16:25:48 -0700
4eca88ff01 Normalized all type name prefixes to "AM". Reduced the AMstatus enum's <type>Ok tags to a single Ok tag. Removed the to_obj macro. Added the to_obj_id macro. Moved the AMobj struct into the result module. Added the AMresult::Nothing variant. Added the AMresultSize function. Added the AMresultValue function. Added the AMlistGet function. Added the AMmapGet function. Removed the AMgetObj function. Added the AMobjSize function. Jason Kankiewicz 2022-03-13 15:56:06 -0700
2f94c6fd90 Compensate for unconfigurable cbindgen behavior. Prevent Doxygen documentation regeneration. Jason Kankiewicz 2022-03-13 15:29:02 -0700
5de00b7998 Alphabetized the cbindgen settings. Jason Kankiewicz 2022-03-13 15:24:45 -0700
a4e8d20266 Optimise getting number of ops when applying tx or changes Andrew Jeffery 2022-03-11 12:25:34 +0000
ac18f7116f And fixup IntoIterator Andrew Jeffery 2022-03-11 12:25:18 +0000
67251f4d53 Have splice take IntoIterator Andrew Jeffery 2022-03-11 12:24:02 +0000
2e49561ab2 Make splice take iterator instead of vec Andrew Jeffery 2022-03-11 12:13:11 +0000
927c867884 Replace no longer returns an op Andrew Jeffery 2022-03-11 12:04:00 +0000
288b4674a0

Merge pull request #308 from jeffa5/experiment-redundant-objid Andrew Jeffery 2022-03-11 11:40:52 +0000
488df55385 Remove change field on Op as unused Andrew Jeffery 2022-03-11 09:10:06 +0000
a2cb15e936 Remove obj from the op as it can be gotten from the optree Andrew Jeffery 2022-03-11 09:08:15 +0000
4b52c2053e

Merge pull request #307 from jeffa5/experiment-apply-change Andrew Jeffery 2022-03-11 11:39:03 +0000
ce9771b29c

Merge pull request #306 from blaine/marks Orion Henry 2022-03-10 19:41:16 -0500
e00797c512 test for attribution correctly not surfacing temporary text (inserted and deleted after baseline) Blaine Cook 2022-03-10 15:42:57 -0800
4fa1d056c6 Stop exposing apply_change Andrew Jeffery 2022-03-10 18:22:06 +0000
57a0f62b75 v0.0.19 wasm Orion Henry 2022-03-10 09:23:23 -0500
ed232fae72

Merge pull request #305 from automerge/paths Orion Henry 2022-03-10 09:22:59 -0500
e1f8d769f4 update authors Orion Henry 2022-03-10 08:53:07 -0500
4ff6dca175 rename error message for foreign objid Orion Henry 2022-03-10 08:47:52 -0500
ee116bb5d7 object_type returns an option Orion Henry 2022-03-09 19:42:58 -0500
a0f78561c4 Merge branch 'paths' into marks Orion Henry 2022-03-09 19:28:10 -0500
c51073c150 add paths/materialize to api Orion Henry 2022-03-09 17:53:30 -0500
ff1a20c626 Document some sync api Andrew Jeffery 2022-03-09 13:04:10 +0000
b14d874dfc Move sync structs to module Andrew Jeffery 2022-03-09 12:43:52 +0000
aad4852e30 Misc API updates Andrew Jeffery 2022-03-09 12:33:20 +0000
63b4c96e71 Update save call Andrew Jeffery 2022-03-09 10:33:57 +0000
1b1d50dfaf Update delete nothing tests Andrew Jeffery 2022-03-09 09:38:03 +0000
d02737ad12 Fix del missing key in map Andrew Jeffery 2022-03-08 17:42:03 +0000
8f4c1fc209 Add failing tests for deleting nothing Andrew Jeffery 2022-03-04 17:30:19 +0000
304195d720 Fix typo on QueryResult Andrew Jeffery 2022-03-09 11:14:21 +0000
b81e0fd619 update wasm test for set_object Orion Henry 2022-03-07 11:46:25 -0500
3e5525f1a6

Merge pull request #304 from jkankiewicz/c_api_exp Orion Henry 2022-03-09 14:36:29 -0500
1c21abc5a3 Fix CMake and Rust code formatting issues. Jason Kankiewicz 2022-03-09 11:13:01 -0800
0fca6a48ee Add loading to edit-trace rust benchmark Andrew Jeffery 2022-03-09 18:12:05 +0000
5b2582bc04

Merge pull request #301 from jeffa5/experiment-value-api Orion Henry 2022-03-09 12:06:54 -0500
f4ba1770a9

Merge pull request #300 from jkankiewicz/c_api_exp Orion Henry 2022-03-09 12:05:58 -0500
42233414b3 Add some documentation Andrew Jeffery 2022-03-09 16:52:52 +0000
0d7f52d21f

Merge pull request #303 from jeffa5/experiment-wasm-tests-ci Andrew Jeffery 2022-03-09 16:11:56 +0000
d3b97a3cbb Add wasm tests to CI Andrew Jeffery 2022-03-09 16:02:08 +0000
f230be8aec change the wasm commit back to an array Orion Henry 2022-03-09 10:41:14 -0500
e4d85f47a3

Merge pull request #302 from jeffa5/experiment-misc-api Orion Henry 2022-03-09 09:48:49 -0500
266f112e91 Document some sync api Andrew Jeffery 2022-03-09 13:04:10 +0000
e26837b09d Move sync structs to module Andrew Jeffery 2022-03-09 12:43:52 +0000
d00cee1637 Misc API updates Andrew Jeffery 2022-03-09 12:33:20 +0000
3cff67002a

Merge pull request #297 from jeffa5/experiment-del-nothing Andrew Jeffery 2022-03-09 11:15:22 +0000
ebe7bae992 Fix typo on QueryResult Andrew Jeffery 2022-03-09 11:14:21 +0000
875bfdd7f2 Update save call Andrew Jeffery 2022-03-09 10:33:57 +0000
5f200e3bf5 Update delete nothing tests Andrew Jeffery 2022-03-09 09:38:03 +0000
a9737a6815 Fix del missing key in map Andrew Jeffery 2022-03-08 17:42:03 +0000
73ac96b7a2 Add failing tests for deleting nothing Andrew Jeffery 2022-03-04 17:30:19 +0000
4b32ee882a Cleanup value API Andrew Jeffery 2022-03-09 10:28:25 +0000
f41b30d118 Added a brief description of the AmObjType enum. Added the AmStatus enum to the enum docs page. Jason Kankiewicz 2022-03-08 22:08:36 -0800
af7386a482 Added a unit test suite for the AMlistSet* functions. Jason Kankiewicz 2022-03-08 21:50:52 -0800
1eb70c6eee Added the rest of the AMlistSet* functions. Started the enum tags at 1 so they won't be inherently false. Alphabetized enum tags for the docs. Improved the docs. Jason Kankiewicz 2022-03-08 21:42:42 -0800
6489cba13b Alphabetize functions in the docs. Jason Kankiewicz 2022-03-08 18:01:46 -0800
22b62b14b5 forgot to add the new file Orion Henry 2022-03-08 12:03:31 -0500
cbf1ac03b2 added attribute2() - janky version Orion Henry 2022-03-08 12:00:02 -0500
74c245b82d

Fix a typo in AMmapSetObject()'s documentation. Jason Kankiewicz 2022-03-08 07:54:25 -0800
b2a879ba4e

Append missing EOF linefeed. Jason Kankiewicz 2022-03-08 06:24:22 -0800
fbf0f29b66 Merge branch 'c_api_exp' of https://github.com/automerge/automerge-rs into c_api_exp Jason Kankiewicz 2022-03-08 01:08:12 -0800
c56d54b565 Added unit test cases for the new AMmapSet* functions by @orionz. Moved the unit test cases for the AMmapSet* functions into their own unit test suite. Jason Kankiewicz 2022-03-08 01:07:11 -0800
7e59b55760 Edited the Doxygen documentation. Jason Kankiewicz 2022-03-08 01:01:47 -0800
4094e82f04 rename tests to attribute Orion Henry 2022-03-07 13:48:22 -0500
42446fa5c2 blame -> attribute Orion Henry 2022-03-07 13:45:56 -0500
bf1ae60913 fmt Orion Henry 2022-03-07 11:59:22 -0500
e82a7cc78e

Merge pull request #299 from jkankiewicz/c_api_exp Orion Henry 2022-03-07 11:55:32 -0500
beae33402a update wasm test for set_object Orion Henry 2022-03-07 11:46:25 -0500
965c2d56c3 Enable unit testing of the C API. Jason Kankiewicz 2022-03-07 06:37:36 -0800
a44e69d2c7 remove datatype mapset Orion Henry 2022-03-06 14:00:46 -0500
88153c44e7

Merge pull request #298 from jkankiewicz/rebase_c_api_exp Orion Henry 2022-03-06 10:32:39 -0500
c6194e9732

Merge branch 'c_api_exp' into rebase_c_api_exp Jason Kankiewicz 2022-03-06 01:09:56 -0800
a2d745c8d9 Replace the utils::import_value function with the utils::import_scalar function. Exclude # Safety comments from the documentation. Jason Kankiewicz 2022-03-06 00:44:37 -0800
0681e28b40 support new as_ref api Orion Henry 2022-03-03 16:04:17 -0500
916e23fcc2 fmt Orion Henry 2022-03-03 15:56:27 -0500
71cd6a1f18 lock data at 64 bit - no c_long Orion Henry 2022-03-03 15:54:38 -0500
e00bd4c201 verbose Orion Henry 2022-03-03 15:27:55 -0500
39d157c554 clippy cleanup Orion Henry 2022-03-03 14:56:23 -0500
7f650fb8e0 Added Doxygen documentation generation. Renamed AMDatatype to AmDataType. Reorganized the AmDataType tags. Renamed AMfree() to AMdestroy(). Renamed AMclone() to AMdup(). Jason Kankiewicz 2022-02-23 02:14:06 -0800
b0b803eef8 get simple test passing Orion Henry 2022-02-22 11:30:42 -0500
cab9017ffa rework to return a queriable result Orion Henry 2022-02-09 15:50:44 -0500