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

• f40f1d9f75
  docs: endpoint documentation timokoesters 2020-07-31 14:40:28 +02:00
• cfda76860b Merge pull request 'Make default server name more obvious' (#192) from spaetz/conduit:master into master Timo Kösters 2020-08-18 20:51:15 +02:00
• 6b7e92ccf5 Make default server name more obvious Sebastian Spaeth 2020-08-18 17:42:11 +02:00
• 6191c3bd00 Merge pull request 'Fix license.' (#190) from q-b/conduit-fork:license into master Timo Kösters 2020-08-17 14:13:19 +02:00
• 0fef955b28 Fix license. Faelar 2020-08-17 13:59:35 +02:00
• 2d96323d5f Merge pull request 'Update ruma' (#184) from jplatte/conduit:up-ruma into master Timo Kösters 2020-08-13 09:04:22 +02:00
• 75ea0b3163
  Update ruma Jonas Platte 2020-08-12 23:32:39 +02:00
• 4b3d6e736f Merge pull request 'Alpine based Docker image' (#152) from Weasy666/conduit:master into master Timo Kösters 2020-08-12 21:42:58 +02:00
• 2fc99c05e1
  docs: add documentation to the repo and improve layout Timo 2020-08-12 21:17:53 +02:00
• 87ed132ae4 Add README in docker folder and mention docker in Conduit's README Daniel Wiesenberg 2020-08-04 22:06:13 +02:00
• 7288010e55 Move additional files into dedicated folder and make build the def... Daniel Wiesenberg 2020-08-04 22:04:27 +02:00
• 31c725660f Add build option to compose file Daniel Wiesenberg 2020-08-02 16:29:50 +02:00
• 7456caeefd Add Element-Web to compose and provide extra compose files for using.. Daniel Wiesenberg 2020-08-02 15:55:40 +02:00
• 5f3cb3f926 Minor modifications to compose file and update Dockerfile comments Daniel Wiesenberg 2020-08-02 12:58:52 +02:00
• 0338053774 Add ability to switch between local and remote build with build arg a... Daniel Wiesenberg 2020-08-01 18:20:30 +02:00
• ecb6416244 Image now builds and runs 🎉 Thx to the help of yzhr Daniel Wiesenberg 2020-08-01 15:18:49 +02:00
• a21858758c Change labels from label-schema to opencontainer.image Daniel Wiesenberg 2020-07-27 18:10:34 +02:00
• 624ff08a07 Initial docker files trinity Daniel Wiesenberg 2020-07-23 23:58:08 +02:00
• 0f1e3d8214 Merge pull request 'Make State struct constructable by lib user' (#178) from DevinR528/conduit:library-mode into master Timo Kösters 2020-08-04 08:03:41 +02:00
• da1c53aaef Make State struct constructable by lib user Devin Ragotzy 2020-08-03 20:56:14 -04:00
• 4a8bc93b1a Merge pull request 'Send invites only if invited during the sync request' (#176) from gnieto/conduit:fix/send-invite-when-needed into master Timo Kösters 2020-08-02 10:41:05 +02:00
• b575593647 Do not ignore db errors Guillem Nieto 2020-08-02 09:38:20 +02:00
• 47abe6686e Send invites only if invited during the sync request Guillem Nieto 2020-08-02 09:24:47 +02:00
• 935f0e6185 Merge pull request 'feat: handle /publicRooms pagination' (#174) from publicrooms-pagination into master Timo Kösters 2020-07-30 22:52:23 +02:00
• 98f37302a6
  feat: handle /publicRooms pagination timokoesters 2020-07-30 22:09:11 +02:00
• 5cfda2f5d3 Merge pull request 'feat: handle inhibit_login in /register' (#173) from inhibit-login into master Timo Kösters 2020-07-30 22:21:09 +02:00
• 0616acbde6
  feat: handle inhibit_login in /register timokoesters 2020-07-30 20:49:29 +02:00
• acc7b15981 Merge pull request 'refactor: put endpoints into modules' (#172) from route-files into master Timo Kösters 2020-07-30 19:09:43 +02:00
• c1c62b7eb4
  refactor: put endpoints into modules timokoesters 2020-07-30 18:14:47 +02:00
• 485a24398b Merge pull request 'Implement ignore invite when inviting user is ignored' (#164) from DevinR528/conduit:ignored-list-invite into master Timo Kösters 2020-07-30 15:27:08 +02:00
• 7a70d8488f Rebase with master and update append_pdu call Devin Ragotzy 2020-07-30 08:43:51 -04:00
• c8d7d80eb2 Fix start/end token swap left from dropped commits Devin Ragotzy 2020-07-30 07:50:09 -04:00
• 99220565d4 Fix invite leave auth error by moving update_membership Devin Ragotzy 2020-07-29 17:07:12 -04:00
• 25c0e75f29 Cargo fmt Devin Ragotzy 2020-07-29 14:28:40 -04:00
• 8aac332b3a Move ignore invite logic into update_member Devin Ragotzy 2020-07-29 13:47:50 -04:00
• f2fab27d81 Implement filtering invites if sender is ignored by receiver Devin Ragotzy 2020-07-27 20:48:51 -04:00
• 100e3d6d6d Merge pull request 'improvement: handle limit and set limited in /user_directory/search' (#169) from user-dir-limit into master Timo Kösters 2020-07-30 15:19:21 +02:00
• 52b1df6fd2
  improvement: handle limit and set limited in /user_directory/search timokoesters 2020-07-30 11:12:49 +02:00
• 18dcf44aa4 Merge pull request 'fix: send device list updates when user is in no rooms' (#170) from fix-set-up-encryption into master Timo Kösters 2020-07-30 14:46:27 +02:00
• ce460ea159
  fix: send device list updates when user is in no rooms timokoesters 2020-07-30 14:05:08 +02:00
• c824652de6 Merge pull request 'Fix clippy warnings and run rustfmt' (#163) from DevinR528/conduit:clippy-fix2 into master Timo Kösters 2020-07-30 08:20:31 +02:00
• b67372b11b
  refactor: make all mods in database pub timokoesters 2020-07-29 21:27:49 +02:00
• d948f896c0
  Turn append_pdu args into struct PduBuilder Devin Ragotzy 2020-07-28 09:00:23 -04:00
• 1c6f211933
  Create media::FileMeta to represent a file and meta data Devin Ragotzy 2020-07-28 08:59:30 -04:00
• 2da48b941d
  Convert all map_err -> expect when deserializing to Raw Devin Ragotzy 2020-07-27 19:46:38 -04:00
• 62df9ca580
  Fix all clippy warnings, shorten line len in client_server Devin Ragotzy 2020-07-25 23:56:50 -04:00
• 3ccbd02081 Merge pull request 'Long polling and more' (#162) from longpoll into master Timo Kösters 2020-07-29 21:17:58 +02:00
• e0d0fb4703
  fix: only send device_one_time_keys_count when there are updates timokoesters 2020-07-29 20:44:06 +02:00
• 66bc25fcd3
  feat: implement /keys/changes timokoesters 2020-07-29 17:37:26 +02:00
• 0693387769
  improvement: more efficient /sync and only send device updates when sharing a room timokoesters 2020-07-29 17:03:04 +02:00
• 310b0fcd86
  fix ci timokoesters 2020-07-28 22:21:57 +02:00
• d891bbb5dc
  improve: presence timokoesters 2020-07-28 15:58:50 +02:00
• 05f9d927b8
  fix: account data timokoesters 2020-07-28 14:02:29 +02:00
• 21eb8d4fe3
  fix: problems with pdu serialization timokoesters 2020-07-27 21:53:28 +02:00
• dd3dab39ae
  feat: whoami route timokoesters 2020-07-27 17:38:00 +02:00
• 489cbc0a93
  refactor: use <_> instead of <_parameter_name> timokoesters 2020-07-27 17:36:54 +02:00
• cc411c530b Fix custom account data serialization (#165) gnieto 2020-07-29 07:48:34 +02:00
• c4260bde81 Merge pull request 'Timo's Conditionally emit rocket::http_verb attr macros if lib/bin' (#157) from timo-make-lib into master Timo Kösters 2020-07-27 20:40:30 +02:00
• e6a1b0b66f
  Add cfg_attr gate to server_server endpoints Devin Ragotzy 2020-07-26 09:39:57 -04:00
• 42e0102a2a
  Conditionally emit rocket::http_verb attr macros if lib/bin Devin Ragotzy 2020-07-25 23:08:00 -04:00
• b82fd02ee3 Merge pull request 'Implement /rooms/<room_id>/joined_members' (#143) from joined_members into master Timo Kösters 2020-07-27 18:22:04 +02:00
• 4d4969862a
  Implement /rooms/<room_id>/joined_members CapsizeGlimmer 2020-07-10 02:49:05 -04:00
• fdb7b8f0f1 Merge pull request 'Implement max_request_size config option' (#153) from media-size-config into master Timo Kösters 2020-07-27 18:08:50 +02:00
• 5f47cbf7dc
  improvement: documentation timokoesters 2020-07-27 18:06:27 +02:00
• 8fcf8e20b8
  fix MR 153 requests; cargo fmt CapsizeGlimmer 2020-07-24 16:04:01 -04:00
• fa2da9e048
  Implement max_request_size config option CapsizeGlimmer 2020-07-23 23:03:24 -04:00
• 3451b10a4b Merge pull request 'Fix CI' (#161) from fix-ci into master Timo Kösters 2020-07-27 08:21:34 +02:00
• 2765071201
  Fix CI timokoesters 2020-07-27 08:19:14 +02:00
• 75d91b9064 Merge pull request 'feat: encryption_disabled config option' (#160) from disable-encryption-config into master Timo Kösters 2020-07-27 08:15:04 +02:00
• 808a7deae3
  cargo fmt timokoesters 2020-07-26 22:45:10 +02:00
• dc5fb7e33a
  feat: encryption_disabled config option timokoesters 2020-07-26 20:41:10 +02:00
• 5a8705bd25 Add room tags (#140) gnieto 2020-07-26 22:33:20 +02:00
• c3d142ad28 Merge pull request 'fix: stop /messages at to' (#159) from fix-to into master Timo Kösters 2020-07-26 22:21:39 +02:00
• b7df8fe83c
  fix: stop /messages at to timokoesters 2020-07-26 17:34:12 +02:00
• 20ab19d828 Merge pull request 'Upgrade ruma' (#158) from jplatte/conduit:up-ruma into master Timo Kösters 2020-07-26 17:20:11 +02:00
• 09561ccea3
  Upgrade ruma Jonas Platte 2020-07-26 15:41:28 +02:00
• f8544bf6e3 Merge pull request 'improvement: only remove to-device events when sure the client received them' (#139) from improve-to-device-removal into master Timo Kösters 2020-07-26 14:14:08 +02:00
• 16576d19cd
  improvement: only remove to-device events when sure the client received them timokoesters 2020-07-03 11:24:23 +02:00
• 678f33acf9 Merge pull request 'Moving to ruma-monorepo' (#133) from DevinR528/conduit:ruma-mono into master Timo Kösters 2020-07-25 22:02:45 +02:00
• 87fd432527 Refactor account_data to be more similar to other endpoints Devin Ragotzy 2020-07-25 15:48:12 -04:00
• 60381ddcf4 Update to latest ruma/master rev Devin Ragotzy 2020-07-25 14:25:24 -04:00
• 61458536ab Merge branch 'master' of https://git.koesters.xyz/timo/conduit into ruma-mono Devin Ragotzy 2020-07-25 13:46:28 -04:00
• 630196f0a3 Implement get_joined_rooms (#155) aura 2020-07-25 18:35:22 +02:00
• be43b9557e Merge pull request 'improvement: switch to stable rust' (#151) from stable into master Timo Kösters 2020-07-23 10:23:01 +02:00
• d8e1248df6
  improvement: switch to stable rust timokoesters 2020-07-22 21:57:14 +02:00
• 84d47da392 Simplify deserialization and deconstruction for Responses Devin R 2020-07-21 16:26:01 -04:00
• 33bc666859 Use sync ephemeral events in sync Resposne (remove room_id) Devin R 2020-07-21 14:04:39 -04:00
• 9a993fa7c1 Convert Pdu to a validated ruma type when calling to_*_event Devin R 2020-07-18 08:22:30 -04:00
• 75959cdc10 Resolve stying review issues Devin R 2020-07-18 08:21:25 -04:00
• 029c60be78 Replace to_string into_boxed_str with into Devin R 2020-07-17 19:52:04 -04:00
• 59cbf202e4 Cargo.lock updated while rebasing Devin R 2020-07-17 16:05:53 -04:00
• d02685a4fd Update to latest ruma/ruma commit Devin R 2020-07-17 16:00:39 -04:00
• 63e23154f3 Rebase with key backups and cross signing Devin R 2020-06-26 18:34:11 -04:00
• 84dcb885a7 Return correct Errors and replace panic, fix misc review issues Devin R 2020-06-24 17:03:33 -04:00
• ddc7598870 Use ruma/ruma master Devin R 2020-06-23 18:58:39 -04:00
• 24b6702047 Add to_*_event_stub methods to pdu, filter for correct event kind Devin R 2020-06-22 07:26:09 -04:00
• 7c38e53839 Move to depend on ruma monorepo and ruma-events0.22 Devin R 2020-06-21 15:58:42 -04:00
• 9c095f1538 Update README, fix CI (#148) Timo Kösters 2020-07-16 07:50:11 +02:00
• b9de21949d Update to rocket master (#147) Timo Kösters 2020-07-14 18:23:26 +02:00
• 469071e105 feat: implement /event (#144) the0 2020-07-11 14:08:37 +02:00