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/admin-command-docs

jade/ai-slop-db-docs

jade/css-small-screen

jade/docs-updates-20250701

jade/logging-features

jade/msc2815

jade/purge-sync-tokens

jade/read-receipts

jade/relations

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/pins-backfill

nex/fix-create-auth

nex/fix/msc4307

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

#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

#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

• 4dcc080ad9 Merge branch 'pre-release-doc-changes' into 'next' Jonas Zohren 2022-02-04 17:12:33 +00:00
• d55992dc83 Merge branch 'jemallocfeature' into 'next' Timo Kösters 2022-02-04 17:08:03 +00:00
• 103dc7e09b
  Pre-0.3 doc adjustments Jonas Zohren 2022-02-04 17:57:59 +01:00
• dffa5570e7 Merge branch 'emptysearchcrash' into 'next' Timo Kösters 2022-02-04 16:42:56 +00:00
• dd03608f17
  use our own reqwest fork Timo Kösters 2022-02-04 17:24:45 +01:00
• eb0b2c429f
  fix: crash on empty search Timo Kösters 2022-02-04 17:15:21 +01:00
• 8d8edddb2e
  feat: allow disabling jemalloc via feature Timo Kösters 2022-02-04 16:59:30 +01:00
• f35ad27627 Merge branch 'contextfix' into 'next' Timo Kösters 2022-02-04 13:45:57 +00:00
• 72cd52e57c
  fix: lazy loading for /context Timo Kösters 2022-02-04 13:30:42 +01:00
• 8db7d2c025 Merge branch 'asonix/encourage-reqwest-reuse' into 'next' Timo Kösters 2022-02-04 11:27:41 +00:00
• 51cca1a60f Merge branch 'create-admin-room' into 'next' Timo Kösters 2022-02-03 21:09:21 +00:00
• e1c0dcb6bb Create admin room and hide migration messages on first run Andrei Vasiliu 2022-02-03 20:52:41 +02:00
• 86a9ec9f44 Merge branch 'up-ruma' into 'next' Timo Kösters 2022-02-03 19:41:47 +00:00
• d23d6fbb37
  Upgrade Ruma Jonas Platte 2022-02-03 20:23:35 +01:00
• 2d9c5791a6 Merge branch 'rocket-config' into 'next' Timo Kösters 2022-02-03 19:20:49 +00:00
• 92571d961f
  Remove mutation from default_config and set default log_level to off Jonas Platte 2022-02-03 19:54:29 +01:00
• 7a388f4d72 Merge branch 'command-refactor' into 'next' Timo Kösters 2022-02-03 18:43:54 +00:00
• b56efcdc2a Merge remote-tracking branch 'origin/next' into command-refactor Andrei Vasiliu 2022-02-03 20:28:43 +02:00
• 6399a7fe4e Remove dash from admin command help Andrei Vasiliu 2022-02-03 20:21:04 +02:00
• 79345dc2a6 Merge branch 'refactor' into 'next' Timo Kösters 2022-02-03 12:50:55 +00:00
• 974c10e739
  Move Config out of database module Jonas Platte 2022-02-03 13:30:04 +01:00
• ce60fc6859
  Stop using set_env to configure tracing-subscriber Jonas Platte 2022-01-22 13:27:54 +01:00
• abb4b4cf0b
  Remove TryFrom, TryInto imports Jonas Platte 2022-02-03 13:24:04 +01:00
• 4bbff69a24 Merge remote-tracking branch 'origin/next' into command-refactor Andrei Vasiliu 2022-02-03 13:07:15 +02:00
• b4755ba15b Merge branch 'tests' into 'next' Timo Kösters 2022-02-03 10:12:04 +00:00
• 9ef3abacd4
  fix: initial state deserialize->serialize error Timo Kösters 2022-02-02 18:03:50 +01:00
• 87225e70c3 Parse admin command body templates from doc comments Andrei Vasiliu 2022-02-02 21:35:57 +02:00
• 510a44699d Merge branch 'fix-healthcheck-no-port' into 'next' Jonas Zohren 2022-02-02 14:07:49 +00:00
• c4733676cf Apply feedback from Ticho Jonas Zohren 2022-02-02 13:35:15 +00:00
• e5bac5e4f5
  fix: Running in Docker Jonas Zohren 2022-02-02 14:07:35 +01:00
• 9478c75f9d
  Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers Jonas Zohren 2022-02-01 23:51:38 +00:00
• e24d75cffc
  Return the ID of the appservice that was created by register_appservice Torsten Flammiger 2022-01-31 11:52:33 +01:00
• 8f69f02e59
  add error handling for register_appservice too Torsten Flammiger 2022-01-31 10:07:49 +01:00
• da7b55b39c
  Cleanup appservice events after removing the appservice Torsten Flammiger 2022-01-31 09:27:31 +01:00
• bfcf2db497
  fix: mention dependencies to build from source user 2022-01-28 22:26:56 -08:00
• a5f004d7e9
  fix: signature mismatch on odd send_join servers Timo Kösters 2022-02-02 12:36:55 +01:00
• 004dfdeaac Merge branch 'ci-test-using-prebuilt-images' into 'next' Jonas Zohren 2022-02-01 23:51:38 +00:00
• fa4099b138 Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers Jonas Zohren 2022-02-01 23:51:38 +00:00
• caf9834e50
  feat: cache capacity modifier Timo Kösters 2022-02-01 14:42:13 +01:00
• 23aecb78c7
  fix: use to_lowercase on /register/available username Timo Kösters 2022-01-31 15:39:46 +01:00
• e17bbdd42d
  tests Timo Kösters 2022-01-28 17:26:43 +01:00
• 95ca43e20f Merge branch 'cleanup_events_after_unregister_appservice' into 'next' Timo Kösters 2022-01-31 13:24:01 +00:00
• 28d3b348d2 Return the ID of the appservice that was created by register_appservice Torsten Flammiger 2022-01-31 11:52:33 +01:00
• 78502aa6b1 add error handling for register_appservice too Torsten Flammiger 2022-01-31 10:07:49 +01:00
• cc13112592 Cleanup appservice events after removing the appservice Torsten Flammiger 2022-01-31 09:27:31 +01:00
• 677f044d13 Refactor admin code to always defer command processing Andrei Vasiliu 2022-01-30 23:15:53 +02:00
• fb2a7ebf66 Merge branch 'build-dependencies-deploy' into 'next' Timo Kösters 2022-01-29 08:35:54 +00:00
• 8ff95a5a48 fix: mention dependencies to build from source user 2022-01-28 22:26:56 -08:00
• 401b88d16d
  fix: Healtcheck use netstat for port as fallback Jonas Zohren 2022-01-28 23:23:58 +01:00
• 8c1cf733b5 Merge branch 'fix-healthcheck-no-port' into 'next' Jonas Zohren 2022-01-28 21:48:25 +00:00
• 44f7a85077
  fix: Use default port for healthcheck as fallback Jonas Zohren 2022-01-28 22:19:19 +01:00
• b39ddf7be9 Rename reqwest clients, mention cheap client clones in comment Aode (lion) 2022-01-28 12:42:47 -06:00
• 296c68c0cd Merge branch 'get-thumbnail-mxc-as-ref' into 'next' Jonas Platte 2022-01-27 17:14:42 +00:00
• 529e88c7f9 Do not copy mxc string unnecessarily in db.get_thumbnail() Andrej Kacian 2022-01-27 17:47:09 +01:00
• 1059f35fdc use pre-constructed client for well-known requests also Aode (lion) 2022-01-27 10:19:28 -06:00
• f8d1c1a8af Re-use a basic request in all possible cases Aode (Lion) 2022-01-24 18:42:15 -06:00
• 20006c91af Merge branch 'media-download-followup' into 'next' Timo Kösters 2022-01-27 16:24:15 +00:00
• 0f6d232cb1 Style fixes from 'cargo fmt' Andrej Kacian 2022-01-27 17:08:04 +01:00
• ccfc243c2c Make get_remote_content() return Result instead of ConduitResult Andrej Kacian 2022-01-27 17:00:08 +01:00
• f7148def90 Merge branch 'up-ruma' into 'next' Timo Kösters 2022-01-27 15:46:00 +00:00
• 63309e52f8 Merge branch 'media-download-with-filename' into 'next' Timo Kösters 2022-01-27 15:44:56 +00:00
• c4317a7a96 Reduce code duplication in media download route handlers Andrej Kacian 2022-01-27 16:12:39 +01:00
• 9c2000cb89
  Upgrade Ruma Jonas Platte 2022-01-27 16:17:55 +01:00
• 52873c88b7 Fix incorrect HTTP method in doc comments of two media routes Andrej Kacian 2022-01-27 00:27:13 +01:00
• 8472eff277 Implement media download with custom filename Andrej Kacian 2022-01-27 00:25:20 +01:00
• ba8d5abb67 Merge branch 'fix/sccache' into 'next' Jonas Zohren 2022-01-26 18:54:13 +00:00
• ff16729976
  fix: correct RUSTC_WRAPPER path in cross container Maxim De Clercq 2022-01-25 22:36:51 +01:00
• acf1585fc3
  fix: make sure that libatomic is linked statically Maxim De Clercq 2022-01-24 11:45:07 +01:00
• 067fcfc0e4
  fix: remove trailing slash from shared path Maxim De Clercq 2022-01-23 21:19:19 +01:00
• 77ad4cb8f8
  fix: use readelf for checking static compilation Maxim De Clercq 2022-01-23 19:24:36 +01:00
• 64c25ea4a1
  fix: always print ELF information Maxim De Clercq 2022-01-23 18:31:40 +01:00
• c7560b3502
  fix: remove libgcc dependency in ci builds since the binary is ensured to be statically compiled Maxim De Clercq 2022-01-23 18:09:14 +01:00
• c2ad2b3dd7
  fix: pass sccache variables to cross container with build.env.passthrough Maxim De Clercq 2022-01-23 17:38:13 +01:00
• 219dfbabd5
  fix: pass RUSTC_WRAPPER to the cross container and enforce static builds Maxim De Clercq 2022-01-23 17:31:12 +01:00
• 4a34d757d7 Merge branch 'fix/rocksdb-cross-compiling' into 'next' Jonas Zohren 2022-01-23 15:58:27 +00:00
• fd67cd7450
  feat: support targetting i686 Maxim De Clercq 2022-01-23 15:10:42 +01:00
• cd9902637d
  feat: use rustembedded/cross images and use static relocation model to fix cross-compile Maxim De Clercq 2022-01-22 17:34:30 +01:00
• 7505548b94 Merge remote-tracking branch 'refs/remotes/origin/next' into command-refactor Andrei Vasiliu 2022-01-22 14:29:50 +02:00
• f50bdb6010 Merge branch 'list_local_users' into 'next' Timo Kösters 2022-01-22 09:33:32 +00:00
• a021680591
  fix: make sure libatomic is always linked because it's skipped on arm targets Maxim De Clercq 2022-01-22 01:14:36 +01:00
• 3e9abfedb4
  fix: make sure libstdc++ is linked statically when cross-compiling Maxim De Clercq 2022-01-22 00:14:19 +01:00
• b634f9d45c Merge branch 'reqwestfix' into 'next' Timo Kösters 2022-01-21 16:54:35 +00:00
• f88523988e
  improvement: use jemalloc for lower memory usage Timo Kösters 2022-01-21 09:19:19 +01:00
• bfef94f5f4
  fix: linking against libatomic is no longer required since the library path is fixed Maxim De Clercq 2022-01-21 17:26:25 +01:00
• d94f3c1e9a
  fix: make sure cc-rs and bindgen use the correct paths when cross-compiling Maxim De Clercq 2022-01-21 17:06:15 +01:00
• 4ef995cf7d Merge branch 'next' into 'next' Timo Kösters 2022-01-21 15:43:40 +00:00
• 97d56af5bd Add heisenbridge to tested appservices Reiner Herrmann 2022-01-15 17:23:14 +00:00
• 57979da28c Change structopt to clap, remove markdown dependency Andrei Vasiliu 2022-01-21 17:34:21 +02:00
• 58da67e59e Merge branch 'mautrix-signal-support' into 'next' Timo Kösters 2022-01-21 15:33:10 +00:00
• 5d3ba5c628 Merge branch 'WIP_persy_batch_next' into 'next' Timo Kösters 2022-01-21 15:31:46 +00:00
• 960ba8bd99 Merged current next Torsten Flammiger 2022-01-21 14:32:59 +01:00
• ba6d72f3f9 Reformatted Torsten Flammiger 2022-01-21 14:28:07 +01:00
• cc3ef1a8be Improve help text for admin commands Andrei Vasiliu 2022-01-21 11:06:16 +02:00
• f244c0e2ce Merge remote-tracking branch 'refs/remotes/origin/next' into command-refactor Andrei Vasiliu 2022-01-21 10:19:17 +02:00
• e378bc4a2c Refactor admin commands to use structopt Andrei Vasiliu 2022-01-18 13:53:17 +02:00
• ab4f3bd06c Merge branch 'lib-main' into 'next' Timo Kösters 2022-01-20 12:32:39 +00:00
• 8d81c1c072
  Use MSRV for build CI jobs Jonas Platte 2022-01-20 13:23:58 +01:00
• 6bb1081b71
  Use BTreeMap::into_values Jonas Platte 2022-01-20 13:13:14 +01:00
• ff5fec9e74
  Raise minimum supported Rust version to 1.56 Jonas Platte 2022-01-20 12:29:52 +01:00
• 5afb27a5a9
  Use latest stable for Docker image Jonas Platte 2022-01-20 12:29:24 +01:00