Commit graph

Select branches

Hide pull requests

244-support-well-known

Nyaaori/declare-msc3827

Nyaaori/destructive-rocksdb-recovery

Nyaaori/federation-backfill

Nyaaori/full-profile-directory

Nyaaori/private-read-receipts

Nyaaori/read-receipt-config-options

Nyaaori/refactor-next

Nyaaori/remove-misisng-e2ee-readme

Nyaaori/temp-combined-feature-branch

admin-command-for-cache-memory-usage

askstate

async

brokenjoinfix

bump-docker-alpine-to-3.16.2

complement-integration

docs-overhaul

docs-the-second

jonas-test-ci-docker-building-quemu-on-fsinfo-runner

jplatte/up-ruma

lesscache

locks

master

mdbook-docs-preparation

measure-cache-memory-usage

member-reason

next

nyaaori/older-room-versions

perf

performance

presence

recoverbroken

refactor

refactor-ci-fix

ruma

ruma-client

serve-element-web

serve-well-known

stablecrosssigning

state-res-closure-rebased

state-res-perf

state_full_ids_cache

ticho34782694/conduit-rocksdb-memory-usage

unbeatable-101-next-patch-64009

#1000

#1001

#1002

#1003

#1004

#1005

#1006

#1007

#1008

#1009

#1010

#1011

#1012

#1013

#1014

#1015

#426

#427

#428

#430

#431

#432

#433

#434

#435

#436

#439

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#450

#451

#452

#453

#454

#455

#456

#457

#458

#459

#460

#461

#462

#463

#464

#465

#466

#467

#468

#469

#470

#471

#472

#473

#474

#475

#476

#477

#478

#479

#480

#481

#482

#483

#484

#485

#486

#487

#488

#489

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#500

#501

#502

#503

#504

#505

#506

#507

#508

#509

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#550

#551

#552

#553

#554

#555

#556

#557

#558

#559

#560

#561

#562

#563

#564

#565

#566

#567

#568

#569

#570

#571

#572

#573

#574

#575

#576

#577

#578

#579

#580

#581

#582

#583

#584

#585

#586

#587

#588

#589

#590

#591

#592

#593

#594

#595

#596

#597

#598

#599

#600

#601

#602

#603

#604

#605

#606

#607

#608

#609

#610

#611

#612

#613

#614

#615

#616

#617

#618

#619

#620

#621

#622

#623

#624

#625

#626

#627

#628

#629

#630

#631

#632

#633

#634

#635

#636

#637

#638

#639

#640

#641

#642

#643

#644

#645

#646

#647

#648

#649

#650

#651

#652

#653

#654

#655

#656

#657

#658

#659

#660

#661

#662

#663

#664

#665

#666

#667

#668

#669

#670

#671

#672

#673

#674

#675

#676

#677

#678

#679

#680

#681

#682

#683

#684

#685

#686

#687

#688

#689

#690

#691

#692

#693

#694

#695

#696

#697

#698

#699

#700

#701

#702

#703

#704

#705

#706

#707

#708

#709

#710

#711

#712

#713

#714

#715

#716

#717

#718

#719

#720

#721

#722

#723

#724

#725

#726

#727

#728

#729

#730

#731

#732

#733

#734

#735

#736

#737

#738

#739

#740

#741

#742

#743

#744

#745

#746

#747

#748

#749

#750

#751

#752

#753

#754

#755

#756

#757

#758

#759

#760

#761

#762

#763

#764

#765

#766

#767

#768

#769

#771

#772

#773

#774

#775

#776

#777

#778

#779

#780

#781

#782

#783

#784

#785

#786

#787

#788

#789

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#800

#801

#802

#803

#804

#805

#806

#807

#808

#809

#810

#811

#813

#814

#815

#816

#817

#818

#819

#820

#821

#822

#823

#824

#825

#826

#827

#828

#829

#830

#831

#832

#833

#834

#835

#836

#837

#838

#839

#840

#841

#842

#843

#844

#845

#846

#847

#848

#849

#850

#851

#852

#853

#854

#855

#856

#857

#858

#859

#860

#861

#862

#863

#864

#866

#867

#868

#869

#870

#871

#872

#873

#874

#876

#878

#879

#880

#881

#882

#883

#884

#886

#888

#889

#891

#892

#895

#897

#898

#900

#901

#902

#903

#906

#907

#908

#909

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#920

#922

#923

#924

#926

#927

#928

#929

#930

#933

#934

#935

#936

#938

#939

#940

#941

#942

#944

#945

#946

#947

#948

#949

#950

#951

#952

#953

#954

#955

#956

#957

#958

#959

#960

#961

#962

#963

#965

#966

#967

#970

#971

#974

#976

#977

#978

#979

#980

#981

#982

#984

#985

#987

#988

#989

#990

#991

#993

#994

#996

#997

#998

#999

v0.2.0

v0.3.0

v0.4.0

v0.5.0

v0.6.0

Mono Color

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