Commit Graph

Select branches

Hide Pull Requests

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

all-the-lints

askstate

async

brokenjoinfix

bump-docker-alpine-to-3.16.2

chore/format-nix

complement-integration

docs-overhaul

docs-the-second

error-parse-image-thumbnail

generate-config

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

jplatte/up-ruma

lesscache

locks

make-send-leave

master

mdbook-docs-preparation

measure-cache-memory-usage

member-reason

membership-refactor

next

nyaaori/older-room-versions

perf

presence

push-federation-invites-to-appservices

recoverbroken

refactor-ci-fix

restricted-make-send-join

ruma-client

serve-element-web

stablecrosssigning

state-res-closure-rebased

state-res-perf

state_full_ids_cache

ticho34782694/conduit-rocksdb-memory-usage

unbeatable-101-next-patch-64009

unstable-msc4125

update-device-seen-on-usage

v0.2.0

v0.3.0

v0.4.0

v0.5.0

v0.6.0

v0.7.0

v0.8.0

v0.9.0

Mono Color

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