Commit graph

Select branches

Hide pull requests

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

ci-deb

dahsa_uwu/axum-0.8

federation-retry-timer-port

folly-coroutines-async-io

hydra/public

illegal-car-mods

jade/admin-command-docs

jade/ai-slop-db-docs

jade/css-small-screen

jade/dep-updates

jade/docs-updates-20250701

jade/logging-features

jade/msc2815

jade/musl-images

jade/parking_lot

jade/purge-sync-tokens

jade/read-receipts

jade/relations

jade/renovate-config-changes

jade/rocksdb-10-5

jade/rust-toolchain-no-targets

jade/syncv5-typing

jade/tuwunel-2025-06

jade/tuwunel-2025-06-old

jade/upload-ci-binaries

jade/version-stats

main

morguldir/see-eye

newer-media-endpoints

nex/feat/4277-harmonized-reporting-endpoints

nex/feat/async-media

nex/feat/better-logging

nex/feat/fast-joins-hack-do-not-use-DO-NOT-USE

nex/feat/force-leave-room

nex/feat/manual-extremities

nex/feat/pins-backfill

nex/fed-improvements

nex/fix-create-auth

nex/fix/msc4307

nex/fix/sync/leave-omission

nex/wip-751

oddlid/rename-admin-room-bot

renovate/actions-checkout-5.x

renovate/axum-client-ip-0.x

renovate/axum-monorepo

renovate/https-github.com-actions-checkout-5.x

renovate/https-github.com-actions-github-script-8.x

renovate/https-github.com-actions-setup-node-5.x

renovate/major-github-artifact-actions

renovate/rand-0.x

room-deletion-attempt-do-not-use

strawberry/morgs-snake-sync-jason-main

strawberry/nix-ci-stuff

strawberry/valgrind

test

tom/buildkit

tom/ci-fedora-rpm

tom/fixes

tom/git-timestamps

trigger-ci-so-latest-isnt-on-illegal-car-mods

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

#871

#873

#875

#876

#877

#878

#881

#882

#884

#885

#886

#887

#888

#889

#891

#892

#893

#894

#895

#897

#898

#899

#9

#900

#901

#902

#904

#907

#908

#909

#911

#915

#918

#919

#92

#920

#921

#923

#924

#925

#926

#927

#928

#929

#930

#931

#932

#933

#934

#935

#936

#937

#938

#939

#94

#941

#942

#943

#945

#946

#947

#948

#949

#95

#950

#951

#953

#954

#955

#956

#957

#958

#959

#96

#960

#961

#962

#963

#964

#965

#967

#968

#97

#970

#971

#973

#974

#975

#976

#977

#979

#980

#981

#982

#983

#984

#985

#986

#987

#988

#989

#990

#991

#992

#993

#994

#995

#996

#997

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-rc.7

v0.5.0-rc2

v0.5.0-rc3

v0.5.0-rc4

Mono Color

• 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
• 4964e21342
  Merge remote-tracking branch 'origin/master' into federation Timo Kösters 2020-10-07 12:02:36 +02:00
• 6afc4c9b3e
  feat: federation disabled by default Timo Kösters 2020-10-06 21:04:51 +02:00
• c15ae3c126
  fix: invalid typing bytes because of 0xff in numbers Timo Kösters 2020-10-06 20:43:35 +02:00
• bcd1fe1856
  feat: admin room Timo Kösters 2020-10-05 22:19:22 +02:00
• 0d6159c2da
  improvement: get_missing_events route and cleanup Timo Kösters 2020-09-25 12:26:29 +02:00
• ab332363ce
  fix: don't send new requests to servers if we are already waiting Timo Kösters 2020-09-23 15:23:29 +02:00
• 26e200e290 Reduce media ID length from 256 to 32 miruka 2020-09-25 14:18:36 -04:00
• e08dfd982b
  improvement: look at SRV record when sending requests Timo Kösters 2020-09-23 12:03:08 +02:00
• f0beffb0a9 Merge pull request 'Fix ruma dependency' (#211) from fix into master Timo Kösters 2020-09-20 18:18:45 +02:00
• 19207845bc
  Fix ruma dependency Timo Kösters 2020-09-20 13:49:13 +02:00
• 267c721616
  fix: encryption and sync spam Timo Kösters 2020-09-17 22:41:43 +02:00
• 8bcfff2766
  fix: no notification counts for fast /syncs Timo Kösters 2020-09-17 19:58:19 +02:00
• ea3aaa6b5c
  improvement: more efficient /sync with gaps Timo Kösters 2020-09-17 14:44:47 +02:00
• 009e36b680 Fix Caddy integration for reverse-proxy Rudi Floren 2020-09-17 21:11:18 +02:00
• 7c456a0390 Update dockerignore Rudi Floren 2020-09-17 20:14:07 +02:00
• da28c12eeb Try to add TLS reverse proxy for complement Valkum 2020-09-17 15:36:36 +02:00
• 8d66428beb Add intermediate container to hide ARGs Valkum 2020-09-17 12:50:37 +02:00
• 506c2a3146
  fix: can't find count from event in db Timo Kösters 2020-09-16 21:11:38 +02:00
• 3e03787551 Add Complement dockerfile and move sytest dir Valkum 2020-09-16 19:53:27 +02:00
• 4db6d7e430
  fix: remove avatar url checks Timo Kösters 2020-09-16 18:10:17 +02:00
• a567cd81d5
  improvement: better logs on deserialization errors Timo Kösters 2020-09-16 15:08:51 +02:00
• f4078a29eb
  fix: synapse complains about missing origin Timo Kösters 2020-09-16 10:49:54 +02:00
• dd749b8aee
  fix: server keys and destination resolution when server name contains port Timo Kösters 2020-09-15 21:46:10 +02:00
• 005e00e9b1
  fix: remove well-known Timo Kösters 2020-09-15 17:16:55 +02:00
• 1bf614b0f5
  fix: remove transaction_id from pdus over federation Timo Kösters 2020-09-15 17:02:20 +02:00
• b7ab57897b
  fix: sending slowness Timo Kösters 2020-09-15 16:13:54 +02:00
• 0b263208e3
  fix: don't panic on bad server names Timo Kösters 2020-09-15 08:55:02 +02:00
• 71500b14b9
  fix: send to all servers and fix media store Timo Kösters 2020-09-15 08:16:20 +02:00
• f7816b11de
  feat: send messages over federation Timo Kösters 2020-09-14 20:23:19 +02:00
• 9f05ef926a
  fix: filter public room dir Timo Kösters 2020-09-14 16:23:15 +02:00
• d1099e9224
  Update dependencies Timo 2020-08-25 11:49:51 +02:00
• aa5e9e607e
  feat: download media and thumbnails over federation Timo Kösters 2020-09-14 14:20:38 +02:00
• 4e44fedbcd
  fix: room list over federation Timo Kösters 2020-09-14 11:42:16 +02:00
• c5313b3e8f
  improvement: try out multiple servers when joining remote rooms Timo Kösters 2020-09-14 11:00:31 +02:00
• 1f292c09f2
  improvement: better federation joins Timo Kösters 2020-09-13 22:24:36 +02:00
• af53485d70
  fix: avoid pdus without event ids Timo Kösters 2020-09-12 23:38:52 +02:00
• 1f28434988
  feat: hacky transactions Timo Kösters 2020-09-12 22:41:33 +02:00
• e6b1f54857
  Merge remote-tracking branch 'origin/master' into federation Timo Kösters 2020-09-12 22:13:53 +02:00
• 12a8c9badd
  fix: join rooms over federation Timo Kösters 2020-09-12 21:30:07 +02:00
• 1e8fbd8d50
  Update ruma version Timo Kösters 2020-09-08 17:32:03 +02:00
• b5488f86b5 Merge pull request 'Add room upgrade.' (#182) from q-b/conduit-fork:rooms_upgrade into master Timo Kösters 2020-09-01 13:10:30 +02:00
• 698e44a732
  Fix /upgrade account data problems Timo Kösters 2020-09-01 13:07:32 +02:00
• 515465f900
  fix: make element not show "unknown user" warning Timo Kösters 2020-08-31 13:23:39 +02:00
• df55e8ed0b
  Add room upgrade. Faelar 2020-08-06 13:21:53 +02:00
• aef0c8563c Merge pull request 'improvement: add remaining key backup endpoints' (#201) from keybackup into master Timo Kösters 2020-08-31 11:24:11 +02:00
• 2a63d0955a Sort and authenticate the events from /send_join response Devin Ragotzy 2020-08-30 16:08:47 -04:00
• 3b40f3d60e Update state-res crate Devin Ragotzy 2020-08-27 16:10:20 -04:00
• f46c2d1eec Fix review issues, move state-res to spec-comp branch Devin Ragotzy 2020-08-26 11:15:52 -04:00
• 3f4cb753ee
  improvement: add remaining key backup endpoints Timo Kösters 2020-08-27 14:48:20 +02:00
• d15b8d7c4e Merge pull request 'feat: handle txn ids' (#198) from txnids into master Timo Kösters 2020-08-25 21:35:24 +02:00
• 4954df3cc3
  feat: handle txn ids Timo 2020-08-25 13:24:38 +02:00
• d9a29e3e5c Fix state for empty key route Devin Ragotzy 2020-08-25 15:30:25 -04:00
• 6343eea417 Merge pull request 'Docker add healthcheck and mention Docker Hub image' (#196) from Weasy666/conduit:master into master Timo Kösters 2020-08-25 09:40:08 +02:00
• 38ac3e42be Docker add healthcheck and mention Docker Hub image Daniel Wiesenberg 2020-08-24 23:30:39 +02:00
• 0f524955b2 Merge pull request 'fix: send notification count updates when private read receipts change' (#194) from fixrr into master Timo Kösters 2020-08-24 13:39:39 +02:00
• 0c1cc8d82b
  Fix CI Timo 2020-08-24 10:45:57 +02:00
• 33215d6099
  fix: send notification count updates when private read receipts change Timo 2020-08-23 17:29:39 +02:00
• 9aa5e99a0f Merge pull request 'fix: put reason of redaction in the redacted event' (#193) from redact into master Timo Kösters 2020-08-24 10:43:05 +02:00
• f0cb17d7a5 Merge branch 'master' into redact Timo Kösters 2020-08-24 10:42:00 +02:00
• 27ffe77823 Use helper instead of route for get_public_rooms_filtered Devin Ragotzy 2020-08-23 08:32:43 -04:00
• 1848f08292 Use full sorting algorithm on incoming PDU's in membership Devin Ragotzy 2020-08-21 21:44:55 -04:00
• 3c26166fb5 improvement: device list works better Timo 2020-08-21 21:22:59 +02:00
• 972babbc79 fix: set limited to true when skipping messages in /sync Timo 2020-08-19 18:26:39 +02:00
• 672bf4f473 Cargo lock update and a few doc additions Devin Ragotzy 2020-08-21 20:18:56 -04:00
• fe795d38ea Replace route calling routes with helpers Devin Ragotzy 2020-08-21 17:19:18 -04:00
• 5ccdd3694b Add helper function for get_alias route Devin Ragotzy 2020-08-20 12:12:02 -04:00
• ea20032404 Helper for join_room_by_id route so routes aren't calling routes Devin Ragotzy 2020-08-19 19:30:28 -04:00
• 64fb0374b6 Use Vec<u8> instead of string for digest bytes and add roomid_statehash Devin Ragotzy 2020-08-19 19:29:39 -04:00
• d73c6aa8ad Add roomid_statehash tree, clean up review issues Devin Ragotzy 2020-08-19 17:27:24 -04:00
• 846a0098c1 Split append_pdu -> append_pdu and build_and_append Devin Ragotzy 2020-08-18 16:26:03 -04:00
• cb68bf9e0c Use ring crate to generate StatHashes when saving stateid/statehash Devin Ragotzy 2020-08-18 14:32:38 -04:00
• c4f5a0a631 Keep track of State at event for state resolution Devin Ragotzy 2020-08-06 08:29:59 -04:00
• 38663228f5
  fix: put reason of redaction in the redacted event Timo 2020-08-23 16:47:27 +02:00
• 8e55623bde Merge pull request 'More Federation' (#181) from docs into master Timo Kösters 2020-08-23 16:15:01 +02:00
• 7ba9263cc6
  improvement: show most recent PDUs first when searching Timo 2020-08-22 23:09:53 +02:00
• 366554630a
  fix: account registration Timo 2020-08-22 22:49:19 +02:00
• 804d097a18
  fix: wake up /sync for typing events Timo 2020-08-22 22:02:32 +02:00
• c092f06068
  docs: /sync Timo 2020-08-22 21:38:01 +02:00
• df936e8e7e
  improvement: guests are more spec-conform Timo 2020-08-22 21:19:14 +02:00
• 64789537f5
  fix: device list when leaving rooms Timo 2020-08-22 21:00:38 +02:00
• 4323cf5fec
  improvement: device list works better Timo 2020-08-21 21:22:59 +02:00
• f23fb32e95
  fix: set limited to true when skipping messages in /sync Timo 2020-08-19 18:26:39 +02:00
• e457e19088
  feat: search pdus timokoesters 2020-08-18 12:15:27 +02:00
• 27d35f5ab4
  docs: fix /register method Timo 2020-08-18 12:43:27 +02:00
• 69a7cb5142
  fix dependency version Timo 2020-08-14 11:36:25 +02:00
• 3ff17f69ad
  fmt Timo 2020-08-14 11:34:15 +02:00
• 4be68eba76
  feat: allow querying conduit's room list over federation Timo 2020-08-14 11:29:32 +02:00
• 940f533d61
  refactor: avoid some allocations when redacting Timo 2020-08-12 15:33:45 +02:00
• 04eee089e0
  feat: first steps towards joining rooms over federation Timo 2020-08-14 11:31:31 +02:00