Commit graph

Select branches

Hide pull requests

03-13-2025

04-02-2025

04-04-2025

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

federation-retry-timer-port

fix-device-key-reset

folly-coroutines-async-io

main

morguldir/reloadable-tokens

newer-media-endpoints

renovate/axum-client-ip-0.x

renovate/axum-client-ip-1.x

renovate/axum-monorepo

renovate/cargo_toml-0.x

renovate/ctor-0.x

renovate/itertools-0.x

renovate/lock-file-maintenance

renovate/nixos-nix-2.x

renovate/opentelemetry-rust-monorepo

renovate/rand-0.x

renovate/smallvec-1.x-lockfile

room-deletion-attempt-do-not-use

strawberry/morgs-snake-sync-jason-main

strawberry/nix-ci-stuff

strawberry/valgrind

#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

#76

#77

#78

#79

#8

#80

#81

#84

#85

#86

#87

#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-rc4

Mono Color

• 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
• b03d030b71 Merge pull request 'Improve README' (#145) from readme into master Timo Kösters 2020-07-11 09:57:43 +02:00
• f361cb3d39
  Improve README timokoesters 2020-07-11 09:51:58 +02:00
• 8409146415 Merge pull request 'Implement /logout/all' (#141) from CapsizeGlimmer/conduit:logout-all into master Timo Kösters 2020-07-09 19:21:12 +02:00
• 3a8efaeafa Whitelist logout all CapsizeGlimmer 2020-07-07 23:09:29 -04:00
• 76aa44ead3 Add logout/all route to main CapsizeGlimmer 2020-07-05 02:35:19 -04:00
• 7c2144c6d7 Implement /logout/all CapsizeGlimmer 2020-07-04 16:41:05 -04:00
• b81939841b feat: account deactivation (#137) the0 2020-07-05 07:48:19 +02:00
• 67a1f21f5d feat: implement password changing (#138) the0 2020-07-02 20:38:25 +02:00
• e809d819ac Merge pull request 'Key backups and cross signing' (#132) from cross-signing into master Timo Kösters 2020-06-26 19:01:32 +02:00
• b83fba5c44
  chore: update dependencies timokoesters 2020-06-26 18:04:08 +02:00
• 54ad1fbed9
  fix: CI timokoesters 2020-06-26 16:15:18 +02:00
• 05f1f73e10
  improvement: upgrade to sled 0.32 timokoesters 2020-06-26 16:10:56 +02:00
• 24c544f650
  fix: DMs show up as rooms timokoesters 2020-06-26 10:07:02 +02:00
• 8f06d0258a
  Remove is_direct flag from Join event Guillem Nieto 2020-06-19 12:19:07 +02:00
• a49a572d76
  feat: cross-signing timokoesters 2020-06-16 12:11:38 +02:00
• 7031240af3
  improvement: /members route timokoesters 2020-06-14 08:57:47 +02:00
• 02fe030b2a
  improvement: better default push rules timokoesters 2020-06-12 13:18:25 +02:00
• e7803e310a Merge pull request 'fix: update rocket version' (#127) from fix into master Timo Kösters 2020-06-16 13:55:20 +02:00
• db685e0cf7
  fix: update rocket version timokoesters 2020-06-16 13:53:15 +02:00
• 0f72bd9f32 Merge pull request 'fix: update ruma version' (#125) from fix into master Timo Kösters 2020-06-16 12:21:12 +02:00
• 13d474f6ee
  fix: update ruma version timokoesters 2020-06-16 12:19:58 +02:00
• bc959f7634 Merge pull request 'Update 'README.md'' (#123) from timo-patch-1 into master Timo Kösters 2020-06-16 08:44:24 +02:00
• 853ccd6fbf Update 'README.md' Timo Kösters 2020-06-16 08:43:46 +02:00
• b0bbc049fa Merge pull request 'Update 'README.md'' (#122) from timo-bitcoin into master Timo Kösters 2020-06-16 08:42:13 +02:00
• c6194b27a3 Update 'README.md' Timo Kösters 2020-06-16 08:21:06 +02:00
• 7b23069943 Merge pull request 'Remove unused imports' (#119) from PublicByte/conduit:remove-unused-imports into master Timo Kösters 2020-06-11 22:34:49 +02:00
• fa7612f069 refactor: remove unused imports PublicByte 2020-06-11 21:06:43 +02:00
• 4c98079c4c Merge pull request 'refactor: better error handling' (#116) from error-handling into master Timo Kösters 2020-06-11 15:21:23 +02:00
• 56d4742201
  improvement: log bad database errors automatically timokoesters 2020-06-11 10:03:08 +02:00
• 2368a90584
  refactor: better error handling timokoesters 2020-06-09 15:13:17 +02:00
• 80935c5826 Merge pull request 'fix' (#115) from uiaa into master Timo Kösters 2020-06-08 15:19:48 +02:00
• f2a5d46628
  fix timokoesters 2020-06-08 15:17:58 +02:00
• c681f0c494 Merge pull request 'Uiaa + Close registration + optimizations' (#113) from uiaa into master Timo Kösters 2020-06-08 14:30:45 +02:00
• 95047272e8
  fix: let example config show how to use registration_disabled timokoesters 2020-06-08 14:29:44 +02:00
• 176bd114a0
  fix: use correct device in GET /devices timokoesters 2020-06-08 12:28:30 +02:00
• bfe5b89ba4
  style: cargo fmt timokoesters 2020-06-08 11:45:22 +02:00
• 588049678b
  refactor: replace DeviceId with str or String timokoesters 2020-06-07 18:38:00 +02:00
• b4d65ab67d
  improvement: optimize /sync response timokoesters 2020-06-06 22:34:08 +02:00
• 0067f49d52
  feat: close registration with ROCKET_REGISTRATION_DISABLED=true timokoesters 2020-06-06 19:02:31 +02:00
• c85d363d71
  feat: user interactive authentication timokoesters 2020-06-06 18:44:50 +02:00
• 88d091fca1 Merge pull request 'Allow client to load history on newly joined rooms' (#111) from gnieto/conduit:fix/issue-39-history-load into master Timo Kösters 2020-06-07 11:21:53 +02:00
• cc383ac932 Cargo fmt Guillem Nieto 2020-06-06 19:48:01 +02:00
• 9269f009db Allow client to load history on newly joined rooms Guillem Nieto 2020-06-06 17:23:14 +02:00
• 4400bb93bb Merge pull request 'fix: edus will not be removed after timeout' (#108) from fix into master Timo Kösters 2020-06-06 15:26:51 +02:00
• 8eedc12567
  fix: edus will not be removed after timeout timokoesters 2020-06-06 15:23:37 +02:00
• 8f6b446193 Merge pull request 'Switch to the ruma meta-crate' (#106) from jplatte/conduit:master into master Timo Kösters 2020-06-06 08:58:13 +02:00
• 7526fd8602
  Switch to the ruma meta-crate Jonas Platte 2020-06-05 18:19:26 +02:00
• 3a5b292f22 Merge pull request 'feat: heroes' (#102) from fix into master Timo Kösters 2020-06-05 10:08:47 +02:00
• 22a12ac6c0 Merge pull request 'Update 'README.md'' (#104) from riot-fixed into master Timo Kösters 2020-06-05 09:31:23 +02:00
• 08d19c3e0b
  fix: broken dependencies timokoesters 2020-06-05 09:04:51 +02:00
• 0a49b24322 Update 'README.md' Timo Kösters 2020-06-04 22:51:19 +02:00
• d404f902bf
  fix: send presence too often timokoesters 2020-06-04 22:36:48 +02:00
• 32da76b9a2
  feat: heroes, don't send notifications every time timokoesters 2020-06-04 18:27:57 +02:00
• 55e14cbf44 Merge pull request 'Replies load context, /kick, /ban, /unban work' (#101) from fix into master Timo Kösters 2020-06-04 16:53:40 +02:00
• b7f7a39973
  feat: kick,ban,unban user route timokoesters 2020-06-04 15:02:27 +02:00
• a8df1acdfd
  feat: load replies, forward pagination timokoesters 2020-06-04 13:58:55 +02:00
• c655870d23 Merge pull request 'Small fixes' (#98) from fix into master Timo Kösters 2020-06-04 12:05:54 +02:00
• 168f2281fd
  improvement: bundle typing events and only send on changes timokoesters 2020-06-04 11:17:36 +02:00
• 8328eeb5ac
  Make sytest not fail timokoesters 2020-06-03 14:16:56 +02:00
• 1c85b0fd05
  remove tests in favor of sytests timokoesters 2020-06-03 21:29:02 +02:00
• b192fddf2f
  fix: show device display names timokoesters 2020-06-03 20:55:11 +02:00
• 325e373684
  refactor: small changes timokoesters 2020-06-03 16:24:00 +02:00
• 19c9e4b916
  fix: room version 6 timokoesters 2020-06-02 19:32:18 +02:00
• 77318af563 Merge pull request 'Implement devices API (#20)' (#97) from fix into master Timo Kösters 2020-06-03 14:12:01 +02:00
• 0883c44659
  Implement devices API (#20) gnieto 2020-06-03 13:41:30 +02:00
• ed9b544ace Implement devices API (#20) gnieto 2020-06-03 13:41:30 +02:00