Commit graph

Select branches

Hide pull requests

bad-attempt-at-extracting-homeserver-signing-key

dahsa_uwu/axum-0.8

federation-retry-timer-port

folly-coroutines-async-io

illegal-car-mods

jade/additional-checks

jade/ai-slop-db-docs

jade/ci-improvements

jade/contributing-docs

jade/css-small-screen

jade/docs-updates-202506

jade/logging-features

jade/msc2815

jade/purge-sync-tokens

jade/read-receipts

jade/relations

jade/rust-toolchain-no-targets

jade/syncv5-typing

jade/update-dockerfile

jade/version-stats

main

morguldir/see-eye

newer-media-endpoints

nex/fix-create-auth

nex/fix-eager-empty-sync

nex/fix-join-sync-state

nex/force-time-travel

nex/serving-policy

nex/wip-751

oddlid/rename-admin-room-bot

room-deletion-attempt-do-not-use

strawberry/morgs-snake-sync-jason-main

strawberry/nix-ci-stuff

strawberry/valgrind

test

tuwunel-rebase

#10

#101

#102

#106

#109

#11

#110

#112

#113

#114

#119

#12

#120

#121

#122

#123

#124

#125

#127

#128

#129

#13

#130

#131

#132

#135

#137

#138

#139

#14

#140

#141

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#159

#16

#161

#165

#167

#168

#169

#17

#170

#171

#173

#174

#175

#176

#177

#178

#179

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#196

#197

#198

#199

#200

#201

#202

#203

#204

#205

#206

#207

#21

#210

#212

#213

#215

#216

#217

#218

#219

#220

#222

#223

#224

#225

#226

#227

#228

#229

#230

#232

#233

#234

#235

#236

#237

#238

#239

#24

#241

#242

#243

#244

#245

#246

#247

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#262

#263

#264

#265

#266

#267

#269

#27

#270

#276

#277

#278

#279

#28

#280

#283

#284

#285

#286

#287

#290

#292

#293

#294

#295

#296

#297

#298

#299

#301

#301

#302

#305

#306

#307

#308

#309

#309

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#320

#322

#324

#325

#326

#327

#328

#329

#33

#330

#334

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#345

#346

#347

#348

#35

#351

#352

#353

#354

#355

#356

#357

#358

#359

#360

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#380

#381

#382

#383

#384

#385

#385

#387

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#40

#400

#402

#403

#405

#406

#407

#408

#409

#41

#410

#412

#413

#414

#415

#416

#417

#418

#419

#42

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#437

#438

#439

#441

#442

#443

#445

#448

#449

#45

#450

#451

#452

#453

#455

#457

#458

#459

#460

#461

#462

#463

#464

#466

#467

#469

#47

#470

#471

#472

#473

#474

#475

#476

#477

#478

#479

#48

#480

#481

#482

#483

#484

#485

#486

#487

#488

#49

#490

#491

#492

#493

#494

#495

#496

#497

#498

#498

#499

#50

#500

#502

#503

#506

#507

#508

#509

#51

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#53

#530

#531

#533

#534

#535

#537

#538

#539

#54

#541

#542

#543

#544

#545

#546

#547

#548

#549

#550

#551

#553

#555

#557

#558

#559

#56

#560

#561

#562

#563

#564

#565

#566

#567

#57

#570

#571

#574

#575

#576

#577

#578

#58

#580

#585

#587

#588

#589

#59

#590

#592

#593

#594

#597

#598

#599

#60

#600

#601

#602

#603

#604

#607

#607

#608

#609

#61

#610

#613

#614

#617

#618

#619

#62

#620

#621

#622

#624

#625

#626

#627

#628

#629

#63

#631

#632

#633

#634

#636

#637

#638

#639

#640

#641

#642

#643

#645

#646

#647

#648

#651

#652

#654

#658

#66

#660

#662

#663

#664

#666

#667

#667

#668

#668

#669

#669

#67

#670

#673

#673

#674

#675

#678

#68

#681

#682

#684

#687

#69

#694

#695

#695

#698

#701

#705

#706

#71

#711

#712

#717

#72

#721

#722

#723

#725

#726

#726

#727

#728

#728

#729

#729

#73

#730

#730

#732

#732

#737

#737

#74

#75

#752

#754

#755

#756

#757

#758

#759

#76

#760

#761

#767

#769

#77

#770

#772

#773

#774

#777

#78

#780

#781

#782

#786

#787

#788

#789

#79

#790

#791

#792

#795

#796

#797

#798

#8

#80

#800

#801

#802

#803

#806

#807

#808

#81

#810

#814

#815

#816

#817

#818

#819

#826

#830

#831

#832

#833

#835

#838

#84

#840

#841

#842

#846

#847

#85

#850

#853

#856

#857

#86

#860

#861

#862

#864

#867

#868

#869

#87

#870

#9

#92

#94

#95

#96

#97

v0.3.0

v0.3.1

v0.3.2

v0.3.3

v0.3.4

v0.4.1

v0.4.2

v0.4.3

v0.4.4

v0.4.5

v0.4.5-rc

v0.4.6

v0.4.6-rc

v0.4.7-rc

v0.5.0-rc

v0.5.0-rc.5

v0.5.0-rc.6

v0.5.0-rc2

v0.5.0-rc3

v0.5.0-rc4

Mono Color

• 9424ba0559 Merge branch 'logout-devices' into 'master' Timo Kösters 2021-01-16 22:35:08 +00:00
• ebb38cd330
  improvement: respect logout_devices param on password change Devon Hudson 2021-01-16 14:48:24 -07:00
• b1ae2bbeb2 Fixing the incoming events algorithm (review with time) Devin Ragotzy 2021-01-16 16:37:20 -05:00
• 96dc6be14b Use the auth_events for step 6, WIP forward_extremity_ids fn Devin Ragotzy 2021-01-15 15:46:47 -05:00
• 5a8041969d Fix ALL clippy warnings Devin Ragotzy 2021-01-15 11:05:57 -05:00
• 851eb555b6 Abstract event validation/fetching, add outlier and signing key DB trees Devin Ragotzy 2021-01-14 21:32:22 -05:00
• 2ac3ffbb24 Convert uses of Box<ServerName> to a ref Devin Ragotzy 2021-01-14 14:39:56 -05:00
• 7c4e116caa State resolution outline for /send Devin Ragotzy 2020-12-22 12:45:35 -05:00
• 27c4e9d9d5
  Fix signature/hash checks, fetch recursive auth events Devin Ragotzy 2021-01-12 08:26:52 -05:00
• 88f3ee489b
  Fill event_map with all events that will be needed for resolution Devin Ragotzy 2021-01-06 15:05:09 -05:00
• 8a035880f0
  Remove StateStore trait from state-res collect events needed Devin Ragotzy 2021-01-06 08:52:30 -05:00
• 7c4d74bf9b
  Fix clippy warnings remove unused imports Devin Ragotzy 2021-01-05 09:21:41 -05:00
• 0ee239c9d7
  Step 5 in /send just fetches state from incoming server Devin Ragotzy 2021-01-03 17:26:17 -05:00
• 9e83d2b2d5
  Update state-res, use the new Event trait Devin Ragotzy 2020-12-31 08:40:49 -05:00
• 690c066064
  State resolution outline for /send Devin Ragotzy 2020-12-22 12:45:35 -05:00
• c263e13000
  fix: update binary file name in docs for consistency Paul van Tilburg 2021-01-11 20:28:47 +01:00
• ad7b3f184b
  improvement: send 200 response for turn server info Timo Kösters 2021-01-11 17:26:47 +01:00
• d45d033bf1
  fix: send presence updates when going offline Timo Kösters 2021-01-10 17:12:16 +01:00
• b4818716b8
  improvement: better deploy guide Timo Kösters 2021-01-01 13:47:53 +01:00
• d7e56dbfa0
  docs: recommend using binaries Timo Kösters 2020-10-20 14:18:20 +02:00
• 3bdaf6e79e
  improvement: better default config Timo Kösters 2021-01-01 11:24:09 +01:00
• 85364a9c27
  improvement: change federation_enabled to federation_disabled Timo Kösters 2021-01-01 10:52:43 +01:00
• edfd3c1f34
  improvement: better config, better logs Timo Kösters 2020-12-31 21:07:05 +01:00
• df16b2ba98
  fix: rare state races Timo Kösters 2020-12-31 14:52:08 +01:00
• 2cf6fd57b7
  improvement: don't send pdus to appservices if it isn't interested Timo Kösters 2020-12-23 19:41:54 +01:00
• fb9bd34696
  improvement: better warnings when server is unreachable Timo Kösters 2020-12-23 15:53:41 +01:00
• c1bc70aeca
  Merge branch 'kuboschek/conduit-always-query-srv' into appservices Timo Kösters 2020-12-22 20:35:43 +01:00
• 8dcc1dfe56
  improvement: always use port from SRV lookups Leonhard Kuboschek 2020-12-08 12:34:46 +01:00
• f12fbca3c5
  fix: send state in /sync, element displays wrong membership changes Timo Kösters 2020-12-22 20:08:20 +01:00
• 6606e41dde
  feat: improved state store Timo Kösters 2020-12-19 16:00:11 +01:00
• 6e5b35ea92
  feat: implement appservices Timo Kösters 2020-12-08 10:33:44 +01:00
• d62f17a91a
  improvement: cache actual destination Timo Kösters 2020-12-06 11:05:51 +01:00
• 9d4c7c34a0 Merge branch 'cargo-deb-packaging' into 'master' Timo Kösters 2020-12-06 07:31:09 +00:00
• 45086b54b3
  improvement: upgrade dependencies, fix timeline reload bug Timo Kösters 2020-12-05 21:03:43 +01:00
• 164b1633d8
  Update ruma to latest, renamed server keys and removed PduStub Devin Ragotzy 2020-12-04 18:16:17 -05:00
• b869aab5d0
  Cleanup removing debug printing and logging, append non state events Devin Ragotzy 2020-12-04 17:16:29 -05:00
• c173ce43a5
  convert_to_outgoing_federation_event takes CanonicalJsonObj Devin Ragotzy 2020-11-30 14:46:47 -05:00
• 27e686f9ff
  Convert uses of serde_json::Value to CanonicalJsonObject Devin Ragotzy 2020-11-30 12:10:33 -05:00
• b6d721374f
  Have Media db return optional content_type, conversion fixes Devin Ragotzy 2020-11-18 08:36:12 -05:00
• bb24f6ad90
  Address some review issues fmt, errors, comments Devin Ragotzy 2020-11-15 16:48:43 -05:00
• 86bb93f8cf
  Remove outdated TODOs, use StateEvent::from_id_value consistently Devin Ragotzy 2020-11-14 16:18:15 -05:00
• 234b226468
  Fix review issues, Remove EventHash's in prev/auth_events in StateEvent Devin Ragotzy 2020-11-11 14:30:12 -05:00
• acd144e934
  Fix get_closest_parent and cleanup federation/send/:txn Devin Ragotzy 2020-11-08 13:54:59 -05:00
• b13049a6fa
  Fix federated join miss hashing the join event created Devin Ragotzy 2020-11-08 13:49:02 -05:00
• eca0bbb35a
  Fix federated join miss hashing the join event created Devin Ragotzy 2020-11-08 13:49:02 -05:00
• dcd1163806
  All outgoing pdus in Sending must be PduStubs Devin Ragotzy 2020-11-03 21:20:35 +01:00
• c9a6ce54cb
  Add basic handling of EDUs for /send/txn Devin Ragotzy 2020-11-08 14:46:26 -05:00
• 0d69ebdc6c
  Reformat imports and fix clippy warnings Devin Ragotzy 2020-11-08 14:45:52 -05:00
• db8a0c5d69
  Add closest_parent method to Rooms Db insert in order /send pdus Devin Ragotzy 2020-11-08 14:44:02 -05:00
• 96dd3b2880
  Update ruma to latest, fix unstable origin feature in ruma Devin Ragotzy 2020-10-27 19:10:09 -04:00
• 49f6ab503a Merge branch 'better-logs' into 'master' Timo Kösters 2020-12-05 16:36:05 +00:00
• 6e36081573
  improvement: more logging Timo Kösters 2020-11-15 12:17:21 +01:00
• 9439f2c183
  feat: send logs into admin room Timo Kösters 2020-11-14 23:13:06 +01:00
• ecea0d4af2 Merge branch 'fix-admin-room' into 'master' Timo Kösters 2020-12-05 16:31:18 +00:00
• e691e880e0
  fix: logging thread crash when admin room does not exist Timo Kösters 2020-12-02 15:49:50 +01:00
• 1a341543ba
  Lock down the Conduit process in the systemd unit Paul van Tilburg 2020-11-13 21:37:22 +01:00
• 1b4a79d47c
  Add and install README.Debian Paul van Tilburg 2020-11-13 20:50:58 +01:00
• f72554de10
  Split config into a Debian and local part Paul van Tilburg 2020-11-13 20:35:22 +01:00
• 79692db45d
  First version of cargo-deb packaging setup Paul van Tilburg 2020-05-31 22:49:07 +02:00
• 7078443460 Merge branch 'fix_complement' into 'master' Timo Kösters 2020-11-18 20:17:50 +00:00
• 998f9e2109 Merge branch 'sending' into 'master' Timo Kösters 2020-11-09 19:28:56 +00:00
• fc08b13db1 Change CA to PKI per naming in Complement Rudi Floren 2020-11-09 17:32:04 +01:00
• e4c5ed96a9 Sync with newest complement changes Rudi Floren 2020-11-09 17:21:35 +01:00
• 9f8cffcd22
  Admin room improvements Timo Kösters 2020-11-09 12:21:04 +01:00
• 16b22bb432
  fix: don't allow more than 50 PDUs in a transaction Timo Kösters 2020-11-03 21:20:35 +01:00
• 335a33c901 Fix and Improve Complement testing Dockerfile Rudi Floren 2020-10-30 02:57:22 +01:00
• 0762196963
  fix: don't send new events from left rooms Timo Kösters 2020-10-27 20:25:43 +01:00
• 2f5df4aac9
  improvement: more reliable federation sending Timo Kösters 2020-10-21 16:08:54 +02:00
• 18f33b1ece Merge pull request 'Frequent flushing, configurable cache capacity, welcome message' (#237) from small-improvements into master Timo Kösters 2020-10-23 14:41:54 +02:00
• df82314440
  improvement: welcome message Timo Kösters 2020-10-23 14:35:41 +02:00
• 6b3934e31d
  feat: configurable cache capacity Timo Kösters 2020-10-21 21:43:59 +02:00
• 6dbe195695
  improvement: flush after every request that manipulates the db Timo Kösters 2020-10-21 21:28:02 +02:00
• b2a1505535 Merge pull request 'improvement: correct thumbnailing algorithm' (#233) from fix-thumbnailing into master Timo Kösters 2020-10-19 17:46:22 +02:00
• 6bb8284fc0
  improvement: correct thumbnailing algorithm Timo Kösters 2020-10-19 15:29:36 +02:00
• de8bba4b49 Merge pull request 'Fix order of docker command arguments' (#232) from Weasy666/conduit:master into master Timo Kösters 2020-10-19 07:05:18 +02:00
• 2d6b7750fd Fix order of docker command arguments and change repository link to... Daniel Wiesenberg 2020-10-18 23:06:08 +02:00
• cde4178f4a Merge pull request 'fix: use device_id when registering' (#231) from fix-deviceid into master Timo Kösters 2020-10-18 21:54:37 +02:00
• f0a21b6165
  fix: use device_id when registering Timo Kösters 2020-10-18 20:33:12 +02:00
• 9936027e8f Merge pull request 'Change license to Apache-2.0' (#195) from license into master Timo Kösters 2020-10-18 19:37:18 +02:00
• fccd3fdb88 Merge pull request 'Allow unjoined users to read state of world readable rooms' (#230) from allow-reading-state into master Timo Kösters 2020-10-18 16:45:17 +02:00
• f6f15d9396
  Use conduit.rs server in the README shield Timo Kösters 2020-10-18 16:40:02 +02:00
• 243126d393
  Allow reading state if history_visibility is world readable Timo Kösters 2020-10-18 16:19:14 +02:00
• a2dbc6fe6d
  Change license to Apache-2.0 Timo 2020-08-24 11:32:15 +02:00
• 9f487dd93a Merge pull request 'Update README.md' (#229) from update-readme into master Timo Kösters 2020-10-18 13:35:01 +02:00
• ce94ad05a7
  Update README.md Timo Kösters 2020-10-18 13:23:06 +02:00
• fbbf9f8999 Merge pull request 'docs: cross compile' (#226) from cross-compile into master Timo Kösters 2020-10-18 13:03:18 +02:00
• 935546b25b Merge pull request 'fix: random timeline reloads' (#227) from fix-random-timeline-reloads into master Timo Kösters 2020-10-18 09:56:28 +02:00
• 151ef07fb3
  docs: cross compile Timo Kösters 2020-10-18 08:48:31 +02:00
• 12b0efac8b
  fix: random timeline reloads Timo Kösters 2020-10-18 08:56:21 +02:00
• f56b463278 Merge pull request 'fix: double join over federation' (#225) from join into master Timo Kösters 2020-10-17 11:29:03 +02:00
• 9109cb492f
  fix: double join over federation Timo Kösters 2020-10-17 11:24:57 +02:00
• a89f7eaf9f Merge pull request 'Add complement support for CI' (#209) from valkum/complement into master Timo Kösters 2020-10-16 14:34:08 +02:00
• f7c2d23599 Merge branch 'master' into valkum/complement Timo Kösters 2020-10-16 14:27:09 +02:00
• 294fae5cdb Merge pull request 'Update dependencies, remove dbgs' (#222) from deps into master Timo Kösters 2020-10-16 14:12:08 +02:00
• dfcfab5b7e Merge branch 'master' into deps Timo Kösters 2020-10-16 14:06:14 +02:00
• 9d1387954f
  Update dependencies, remove dbgs Timo Kösters 2020-10-16 14:04:29 +02:00
• 15fa7fb1cc Merge pull request 'Reduce media ID length from 256 to 32' (#216) from miruka/conduit:reduce-mxc-length into master Timo Kösters 2020-10-16 13:24:52 +02:00
• b6ed018d16 Merge branch 'master' into reduce-mxc-length Timo Kösters 2020-10-14 11:48:25 +02:00
• 0e817f6951 Merge pull request 'Federation, Admin room and many fixes' (#221) from federation into master Timo Kösters 2020-10-13 19:04:42 +02:00
• 304c53c4f5
  style: make clippy happier Timo Kösters 2020-10-07 12:29:19 +02:00