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/fix-create-auth

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

#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

• 9b63708685 Merge branch 'nyaaori/fix-join-panic' into 'next' Jonas Platte 2021-11-09 14:46:28 +00:00
• 86177faae7
  Fix join panic bug Nyaaori 2021-11-07 07:57:15 +00:00
• 2a749c1e99 Merge branch 'nyaaori/implement-report' into 'next' Timo Kösters 2021-11-03 14:17:32 +00:00
• 5ae753b2e7 Merge branch 'amorgan-next-patch-81816' into 'next' Timo Kösters 2021-10-27 11:49:55 +00:00
• 743bdbe961 Add 'Federation publicRoom Name/topic keys are correct' test to sytest whitelist Andrew Morgan 2021-10-26 13:30:02 +00:00
• d5d25fb064
  Preserve all m.room.create entries when performing room upgrades Nyaaori 2021-10-24 22:13:08 +00:00
• 8087a26a35
  Make createRoom follow spec for m.room.create, allowing creation of spaces Nyaaori 2021-10-24 20:26:51 +00:00
• bbe16f8467
  Update Ruma Nyaaori 2021-10-24 00:45:02 +00:00
• 50f931a2fd
  Cleanup and fix validation in report.rs, lower max report length, better html Nyaaori 2021-10-20 11:12:06 +00:00
• 1541b93f45
  Make reports look nicer and reduce spam potential, increase max report length to 1000 characters Nyaaori 2021-10-18 05:38:41 +00:00
• ccf501a420
  Initial implementation of /report, fixing #13 Nyaaori 2021-10-18 04:51:11 +00:00
• 6f70beb78c Merge branch 'nyaaori/fix-bad-json' into 'next' Timo Kösters 2021-10-16 06:59:34 +00:00
• 259fc580ca Merge branch 'nyaaori/otk-sync-fix' into 'next' Timo Kösters 2021-10-16 06:54:14 +00:00
• 55d78b1914
  Bump Ruma version to fix M_BAD_JSON on login Nyaaori 2021-10-16 00:45:51 +00:00
• 484a044b50
  Remove device_one_time_keys_count from is_empty() sync checks, fixing sync issue as reported by Nekron Nyaaori 2021-10-15 23:17:08 +00:00
• 2264a5f945
  Merge branch 'next' of https://gitlab.com/famedly/conduit into next Nyaaori 2021-10-15 23:14:07 +00:00
• e88929e154 Merge branch 'nyaaori/fix-otk-reporting' into 'next' Timo Kösters 2021-10-15 13:01:52 +00:00
• d996d1b0e6
  Always send device_one_time_keys_count, fixing #178 Nyaaori 2021-10-15 12:38:20 +00:00
• dc8bc4a880 Merge branch 'up-ruma' into 'next' Timo Kösters 2021-10-15 11:38:12 +00:00
• 87694f4369 Merge branch 'moa31-next-patch-76037' into 'next' Timo Kösters 2021-10-15 10:51:19 +00:00
• 335027e739 Merge branch 'nyaaori/admin-check' into 'next' Timo Kösters 2021-10-15 10:47:55 +00:00
• 0ccda5f1c7 Merge branch 'nyaaori/allow_encryption' into 'next' Timo Kösters 2021-10-15 10:20:05 +00:00
• 9082a531c9
  Make allow_encryption work again, fixing #115 Nyaaori 2021-09-24 22:44:26 +00:00
• 91afa1e0e0
  Make Result alias usable with any error type Jonas Platte 2021-10-13 11:56:46 +02:00
• f2ef5677e0
  Reduce turbofish usage Jonas Platte 2021-10-13 11:51:30 +02:00
• 1c4d9af586
  Enable more lints and apply their suggestions Jonas Platte 2021-10-13 10:24:39 +02:00
• 09895a20c8
  Upgrade Ruma Jonas Platte 2021-10-13 10:16:45 +02:00
• 636db8cfaa
  Make allow_encryption work again, fixing #115 Nyaaori 2021-09-24 22:44:26 +00:00
• 6bc8fb2ae7
  Implement admin check and add config option for allowing room creation Nyaaori 2021-09-24 07:16:34 +00:00
• 5b23d3d06e Change listen address when running inside a Container to prevent Bad Gateway error Luc-pascal Ceccaldi 2021-09-23 07:49:52 +00:00
• 47f3263396 Merge branch 'gwmngilfen-next-patch-21674' into 'next' Timo Kösters 2021-09-15 20:31:21 +00:00
• d38f9b5f01 Move Generic instructions for APPSERVICES above notes for specific bridges and tidy up. Greg Sutcliffe 2021-09-15 20:16:59 +00:00
• fa616342b6 Add two flavours of change for the mautrix-signal patch Greg Sutcliffe 2021-09-13 16:22:52 +00:00
• 34fa7fee05 Merge branch 'ci-fix-kaniko-i-hope' into 'next' Timo Kösters 2021-09-15 07:05:33 +00:00
• e8d998cedf fix(ci): Convince kaniko that it is indeed running in a container by --force-ing it. Jonas Zohren 2021-09-14 20:44:11 +00:00
• 565fe3a7dd Merge branch 'faster-sending' into 'next' Timo Kösters 2021-09-14 18:35:12 +00:00
• 5c02dc7830
  improvement: batch inserts for inserting pdus Timo Kösters 2021-09-14 14:23:43 +02:00
• 159e22e450 Merge branch 'ci-fix-aarch64-build' into 'next' Timo Kösters 2021-09-14 12:09:44 +00:00
• ab472e9b7c fix(ci): Fix aarch64 build Jonas Zohren 2021-09-14 12:25:35 +02:00
• 31264e3d1d Merge branch 'ci-remove-element-web-register-test' into 'next' Timo Kösters 2021-09-14 09:50:24 +00:00
• 422bd09e32 Remove the "register an account with element" test Jonas Zohren 2021-09-14 09:44:15 +00:00
• b64538c6f1 Merge branch 'efficient-sqlite' into 'next' Timo Kösters 2021-09-14 07:23:02 +00:00
• 178451e9b5 Merge branch 'deduplicate-watchers' into 'next' Timo Kösters 2021-09-14 07:10:59 +00:00
• 583a966f6e Merge branch 'less-alloc' into 'next' Timo Kösters 2021-09-14 07:09:55 +00:00
• cbee7fe111
  improvement: deduplicate watchers Timo Kösters 2021-09-13 23:19:00 +02:00
• d68c93b5fa
  Clean up (mostly automated with cargo clippy --fix) Jonas Platte 2021-09-13 19:45:56 +02:00
• 979ec6b4fa
  Upgrade ruma Jonas Platte 2021-09-01 15:28:02 +02:00
• 910ad7fed1
  Get rid of more unnecessary intermediate collections Jonas Platte 2021-09-05 00:05:59 +02:00
• 2c8412fe58
  improvement: more efficient sqlite Timo Kösters 2021-09-13 20:11:50 +02:00
• 06b0c9267f Merge branch 'appservice-signal' into 'next' Timo Kösters 2021-09-13 14:07:18 +00:00
• 00927a7ce3 Add mautrix-signal appservice instructions Daniel Wiesenberg 2021-09-09 10:02:11 +02:00
• 4aacafc298 Merge branch 'roomidshort-fix' into 'next' Timo Kösters 2021-09-08 13:39:05 +00:00
• 23c5ec8099 fix sync not firing on new events in room Jonathan de Jong 2021-09-08 14:50:44 +02:00
• 562a2524d7 Merge branch 'db-errors' into 'next' Timo Kösters 2021-09-08 09:53:25 +00:00
• 51245d34f1
  fix(database): handle errors in config parsin or database creation Rasmus Thomsen 2021-09-07 19:41:14 +01:00
• 4a773a1096 Merge branch 'rm-unused-deps' into 'next' Timo Kösters 2021-09-07 14:00:27 +00:00
• 5821b8e705
  Remove unused dependencies Jonas Platte 2021-09-07 15:41:01 +02:00
• 0737bc021f Merge branch 'charludo-next-patch-31617' into 'next' Timo Kösters 2021-09-06 18:38:38 +00:00
• 487046571c These lines get *generated* by certbot. Having them in the file before running certbot results in an apache2 error, and putting them in afterwards is not necessary, since certbot places them there on its own. charludo 2021-09-06 18:35:35 +00:00
• 2d242523fc Merge branch 'next' into 'next' Timo Kösters 2021-09-03 20:56:21 +00:00
• bbe36810ec Fix deprecated/removed Traefik label Daniel Wiesenberg 2021-09-03 21:51:17 +02:00
• a449b1d73f Merge branch 'fix-old-events' into 'next' Timo Kösters 2021-09-03 09:47:24 +00:00
• 71341ea05a
  fix: make sure old events don't sneek into the timeline Timo Kösters 2021-09-03 11:26:15 +02:00
• 73b764322f Merge branch 'adjust-ci-for-next-and-master-development' into 'master' Timo Kösters 2021-09-02 18:25:57 +00:00
• a1f51440e2 chore(CI): Adjust CI for master and next branch development model Jonas Zohren 2021-09-02 17:17:51 +02:00
• 0d6ae2e1e7 Merge branch 'thanks' into 'master' Timo Kösters 2021-09-02 11:10:23 +00:00
• d0baca44f8
  docs: add thanks to Timo Kösters 2021-09-02 13:05:19 +02:00
• 5536bfdca5 Merge branch 'ci-also-run-for-tags' into 'master' Timo Kösters 2021-09-02 07:33:25 +00:00
• 3357bbec1e chore: Also run CI on git tags, not only new commits. Jonas Zohren 2021-09-02 09:17:25 +02:00
• 102ff574ea Merge branch 'readme' into 'master' Timo Kösters 2021-09-01 21:28:28 +00:00
• 2770ce2cf6
  fix: avoid panic Timo Kösters 2021-09-01 22:49:16 +02:00
• 7cd7f1923f
  chore: update dependencies Timo Kösters 2021-09-01 22:31:25 +02:00
• 43d693ca19
  revert Arc<EventId> commit Timo Kösters 2021-09-01 22:18:06 +02:00
• 875b345a5f
  docs: update readme and version Timo Kösters 2021-09-01 13:09:24 +02:00
• 17adf096e9 Merge branch 'server-server-opt' into 'master' Timo Kösters 2021-09-01 20:02:37 +00:00
• 487601a249
  Remove unneeded intermediary container collection Jonas Platte 2021-09-01 21:46:05 +02:00
• 27788af022 Merge branch 'batch_keys' into 'master' Timo Kösters 2021-09-01 19:12:21 +00:00
• 4b39d7cb64
  fix: batch key fetching Timo Kösters 2021-09-01 15:21:02 +02:00
• c53d79e287
  fixup! Get required keys in batch when joining a room Kurt Roeckx 2021-08-29 14:39:38 +02:00
• 984ad5ecd6
  fixup! Get required keys in batch when joining a room Kurt Roeckx 2021-08-29 13:25:20 +02:00
• b546a5bf15
  Let our server signing be valid for 1 week Kurt Roeckx 2021-08-25 16:06:35 +02:00
• a87519fb71
  Get required keys in batch when joining a room Kurt Roeckx 2021-08-25 16:02:01 +02:00
• 9c3f1a9272 Merge branch 'master' into 'master' Timo Kösters 2021-09-01 16:04:41 +00:00
• 8518d59a0b Merge branch 'clippy' into 'master' Timo Kösters 2021-09-01 10:47:23 +00:00
• 4e68c22457 Merge branch 'docs' into 'master' Timo Kösters 2021-09-01 10:20:13 +00:00
• 73d876643c
  improvement: make pdu cache capacity configurable Timo Kösters 2021-09-01 11:03:12 +02:00
• 22779c21d3 Merge branch 'health_script' into 'master' Timo Kösters 2021-09-01 08:08:22 +00:00
• 8c584887c9 Fix healthcheck.sh permissions and rearange ci dockerfile Daniel Wiesenberg 2021-08-31 23:17:32 +02:00
• 33738dbbc2
  improvement: stop prev event fetching if too many events fail Timo Kösters 2021-08-31 22:04:47 +02:00
• a6bb9bbe68
  Fix a bunch of clippy lints Jonas Platte 2021-08-31 21:20:03 +02:00
• b9eb39a9c6
  docs: documentation for every endpoint Timo Kösters 2021-08-31 19:14:37 +02:00
• 364820aae4 Merge branch 'registration-default' into 'master' Timo Kösters 2021-08-31 17:03:05 +00:00
• ec38411620 Merge branch 'health_script' into 'master' Timo Kösters 2021-08-31 16:59:33 +00:00
• 9ec8b7f2b3 registration default true Jonathan de Jong 2021-08-31 18:25:35 +02:00
• a08ea15695 Use $CI_COMMIT_SHORT_SHA for GIT_REF Daniel Wiesenberg 2021-08-31 18:03:44 +02:00
• 49dd3567c6 Merge branch 'connection-lifetime' into 'master' Timo Kösters 2021-08-30 19:05:22 +00:00
• 69df9a0145 add tls Jonathan de Jong 2021-08-30 20:18:48 +02:00
• d0d47675d8 Merge branch 'speed' into 'master' Timo Kösters 2021-08-30 17:32:41 +00:00
• bd4ea14a29
  improvement: call /state_ids less often by using state res Timo Kösters 2021-08-30 16:02:55 +02:00
• 9033cc86aa Merge branch 'speed' into 'master' Timo Kösters 2021-08-30 09:14:08 +00:00