Commit Graph
100 Commits
Author SHA1 Message Date
timokoesters 5f47cbf7dc improvement: documentation 2020-07-27 18:06:36 +02:00
Timo Kösters 3451b10a4b Merge pull request 'Fix CI' (#161) from fix-ci into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/161
2020-07-27 08:21:34 +02:00
timokoesters 2765071201 Fix CI 2020-07-27 08:19:14 +02:00
Timo Kösters 75d91b9064 Merge pull request 'feat: encryption_disabled config option' (#160) from disable-encryption-config into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/160
2020-07-27 08:15:04 +02:00
timokoesters 808a7deae3 cargo fmt 2020-07-26 22:45:10 +02:00
timokoesters dc5fb7e33a feat: encryption_disabled config option
Can be used with ROCKET_ENCRYPTION_DISABLED=true
2020-07-26 22:41:29 +02:00
Timo Kösters c3d142ad28 Merge pull request 'fix: stop /messages at to' (#159) from fix-to into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/159
2020-07-26 22:21:39 +02:00
timokoesters b7df8fe83c fix: stop /messages at to
Fixes #150
2020-07-26 22:21:05 +02:00
Timo Kösters 20ab19d828 Merge pull request 'Upgrade ruma' (#158) from jplatte/conduit:up-ruma into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/158
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-07-26 17:20:11 +02:00
Timo Kösters f8544bf6e3 Merge pull request 'improvement: only remove to-device events when sure the client received them' (#139) from improve-to-device-removal into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/139
2020-07-26 14:14:08 +02:00
timokoesters 16576d19cd improvement: only remove to-device events when sure the client received them
To make this work, I had to remove the recommended limit of 100
to-device events per /sync
(https://matrix.org/docs/spec/client_server/latest#id72)
2020-07-26 13:59:19 +02:00
Timo Kösters 678f33acf9 Merge pull request 'Moving to ruma-monorepo' (#133) from DevinR528/conduit:ruma-mono into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/133
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-07-25 22:02:45 +02:00
Timo Kösters be43b9557e Merge pull request 'improvement: switch to stable rust' (#151) from stable into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/151
2020-07-23 10:23:01 +02:00
timokoesters d8e1248df6 improvement: switch to stable rust 2020-07-22 22:42:01 +02:00
Timo Kösters 9c095f1538 Update README, fix CI (#148)
Update 'README.md'

Update README, fix CI

Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/148
2020-07-16 07:50:11 +02:00
Timo Kösters b9de21949d Update to rocket master (#147)
Merge branch 'master' into rocket

Update to rocket master

Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/147
2020-07-14 18:23:26 +02:00
Timo Kösters b03d030b71 Merge pull request 'Improve README' (#145) from readme into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/145
2020-07-11 09:57:43 +02:00
timokoesters f361cb3d39 Improve README 2020-07-11 09:55:44 +02:00
Timo Kösters 8409146415 Merge pull request 'Implement /logout/all' (#141) from CapsizeGlimmer/conduit:logout-all into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/141
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-07-09 19:21:12 +02:00
Timo Kösters e809d819ac Merge pull request 'Key backups and cross signing' (#132) from cross-signing into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/132
2020-06-26 19:01:32 +02:00
timokoesters b83fba5c44 chore: update dependencies 2020-06-26 18:04:08 +02:00
timokoesters 54ad1fbed9 fix: CI 2020-06-26 16:26:29 +02:00
timokoesters 05f1f73e10 improvement: upgrade to sled 0.32
BREAKING CHANGE: old databases are not compatible anymore
2020-06-26 16:26:28 +02:00
timokoesters 24c544f650 fix: DMs show up as rooms 2020-06-26 15:16:15 +02:00
timokoesters a49a572d76 feat: cross-signing 2020-06-26 15:16:15 +02:00
timokoesters 7031240af3 improvement: /members route 2020-06-16 23:25:15 +02:00
timokoesters 02fe030b2a improvement: better default push rules 2020-06-16 23:25:14 +02:00
Timo Kösters e7803e310a Merge pull request 'fix: update rocket version' (#127) from fix into master 2020-06-16 13:55:20 +02:00
timokoesters db685e0cf7 fix: update rocket version 2020-06-16 13:53:15 +02:00
Timo Kösters 0f72bd9f32 Merge pull request 'fix: update ruma version' (#125) from fix into master 2020-06-16 12:21:12 +02:00
timokoesters 13d474f6ee fix: update ruma version 2020-06-16 12:19:58 +02:00
Timo Kösters bc959f7634 Merge pull request 'Update 'README.md'' (#123) from timo-patch-1 into master 2020-06-16 08:44:24 +02:00
Timo Kösters 853ccd6fbf Update 'README.md' 2020-06-16 08:43:46 +02:00
Timo Kösters b0bbc049fa Merge pull request 'Update 'README.md'' (#122) from timo-bitcoin into master 2020-06-16 08:42:13 +02:00
Timo Kösters c6194b27a3 Update 'README.md' 2020-06-16 08:21:06 +02:00
Timo Kösters 7b23069943 Merge pull request 'Remove unused imports' (#119) from PublicByte/conduit:remove-unused-imports into master 2020-06-11 22:34:49 +02:00
Timo Kösters 4c98079c4c Merge pull request 'refactor: better error handling' (#116) from error-handling into master 2020-06-11 15:21:23 +02:00
timokoesters 56d4742201 improvement: log bad database errors automatically 2020-06-11 14:58:44 +02:00
timokoesters 2368a90584 refactor: better error handling 2020-06-11 13:14:35 +02:00
Timo Kösters 80935c5826 Merge pull request 'fix' (#115) from uiaa into master 2020-06-08 15:19:48 +02:00
timokoesters f2a5d46628 fix 2020-06-08 15:17:58 +02:00
Timo Kösters c681f0c494 Merge pull request 'Uiaa + Close registration + optimizations' (#113) from uiaa into master 2020-06-08 14:30:45 +02:00
timokoesters 95047272e8 fix: let example config show how to use registration_disabled 2020-06-08 14:29:44 +02:00
timokoesters 176bd114a0 fix: use correct device in GET /devices 2020-06-08 14:23:42 +02:00
timokoesters bfe5b89ba4 style: cargo fmt 2020-06-08 11:45:22 +02:00
timokoesters 588049678b refactor: replace DeviceId with str or String 2020-06-08 11:40:19 +02:00
timokoesters b4d65ab67d improvement: optimize /sync response 2020-06-08 11:39:32 +02:00
timokoesters 0067f49d52 feat: close registration with ROCKET_REGISTRATION_DISABLED=true 2020-06-08 11:39:32 +02:00
timokoesters c85d363d71 feat: user interactive authentication 2020-06-08 11:39:30 +02:00
Timo Kösters 88d091fca1 Merge pull request 'Allow client to load history on newly joined rooms' (#111) from gnieto/conduit:fix/issue-39-history-load into master
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-06-07 11:21:53 +02:00
Timo Kösters 4400bb93bb Merge pull request 'fix: edus will not be removed after timeout' (#108) from fix into master 2020-06-06 15:26:51 +02:00
timokoesters 8eedc12567 fix: edus will not be removed after timeout 2020-06-06 15:23:37 +02:00
Timo Kösters 8f6b446193 Merge pull request 'Switch to the ruma meta-crate' (#106) from jplatte/conduit:master into master
Reviewed-by: Timo Kösters <timo@koesters.xyz>
2020-06-06 08:58:13 +02:00
Timo Kösters 3a5b292f22 Merge pull request 'feat: heroes' (#102) from fix into master 2020-06-05 10:08:47 +02:00
Timo Kösters 22a12ac6c0 Merge pull request 'Update 'README.md'' (#104) from riot-fixed into master 2020-06-05 09:31:23 +02:00
timokoesters 08d19c3e0b fix: broken dependencies 2020-06-05 09:04:51 +02:00
Timo Kösters 0a49b24322 Update 'README.md' 2020-06-04 22:51:19 +02:00
timokoesters d404f902bf fix: send presence too often 2020-06-04 22:36:48 +02:00
timokoesters 32da76b9a2 feat: heroes, don't send notifications every time 2020-06-04 19:05:11 +02:00
Timo Kösters 55e14cbf44 Merge pull request 'Replies load context, /kick, /ban, /unban work' (#101) from fix into master 2020-06-04 16:53:40 +02:00
timokoesters b7f7a39973 feat: kick,ban,unban user route 2020-06-04 16:51:36 +02:00
timokoesters a8df1acdfd feat: load replies, forward pagination 2020-06-04 13:58:55 +02:00
Timo Kösters c655870d23 Merge pull request 'Small fixes' (#98) from fix into master 2020-06-04 12:05:54 +02:00
timokoesters 168f2281fd improvement: bundle typing events and only send on changes
Fixes #67 and #49
2020-06-04 11:17:36 +02:00
timokoesters 8328eeb5ac Make sytest not fail 2020-06-04 09:53:26 +02:00
timokoesters 1c85b0fd05 remove tests in favor of sytests 2020-06-04 09:48:33 +02:00
timokoesters b192fddf2f fix: show device display names 2020-06-04 09:48:32 +02:00
timokoesters 325e373684 refactor: small changes 2020-06-03 22:30:51 +02:00
timokoesters 19c9e4b916 fix: room version 6 2020-06-03 22:30:50 +02:00
Timo Kösters 77318af563 Merge pull request 'Implement devices API (#20)' (#97) from fix into master 2020-06-03 14:12:01 +02:00
Timo Kösters 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 2020-06-03 10:27:13 +02:00
Timo Kösters 0a1c4f3649 Merge pull request 'Black list temporaly some room creation tests.' (#50) from jbbouille/conduit:blacklist_some_creation_room_tests into master 2020-06-02 14:44:51 +02:00
Timo Kösters 4c2c0e2458 Merge pull request 'Better notifications and fix redactions' (#44) from notification into master 2020-06-01 22:25:24 +02:00
timokoesters 5a47c75427 fix: make redactions permanent 2020-06-01 20:58:49 +02:00
timokoesters b519bc6962 fix: only show notifications for messages 2020-06-01 20:16:18 +02:00
Timo Kösters 3aa0c8ed25 Merge pull request 'Room visibility, aliases and redaction' (#40) from alias into master 2020-05-31 10:23:04 +02:00
timokoesters 4e507ef706 feat: room visibility and aliases 2020-05-31 09:46:11 +02:00
timokoesters 9c26e22ad7 improvement: load aliases from database 2020-05-31 08:01:11 +02:00
timokoesters 18bf67748c feat: redaction 2020-05-31 08:01:10 +02:00
Timo Kösters 16538a6c16 Update 'README.md' 2020-05-29 10:04:19 +02:00
Timo Kösters 55842a0e57 Update 'README.md' 2020-05-29 09:54:30 +02:00
Timo Kösters 25ebde5af8 Merge pull request 'fix: /register lowercases user ids' (#28) from lowercase into master 2020-05-27 08:26:32 +02:00
timokoesters ca77c79222 fix: /register lowercases user ids
fixes #24
2020-05-27 07:09:23 +02:00
Timo Kösters dd80a8591d Merge pull request 'Get device_id from body instead of auth data' (#27) from gnieto/conduit:fix/create-device into master 2020-05-27 07:03:21 +02:00
Timo Kösters d0e5a39d1d Merge pull request 'Move create room test into blacklist - fixes #23' (#26) from jbbouille/conduit:remove_create_public_room_test into master 2020-05-26 16:57:11 +02:00
timokoesters 58683585cc improvement: show more info in public rooms list 2020-05-25 20:16:36 +02:00
Timo Kösters 63c62a4afa Update 'README.md' 2020-05-25 17:36:54 +02:00
Timo Kösters 1096c2847b Merge pull request 'Access control' (#22) from control into master 2020-05-25 16:59:40 +02:00
timokoesters b6c0e9bfb2 feat: access control 2020-05-25 16:40:00 +02:00
timokoesters c8ba9dce01 feat: proper room creation 2020-05-25 16:39:58 +02:00
timokoesters 1014388a9c fix: one time keys are never removed 2020-05-23 19:17:55 +02:00
timokoesters 5d6542a8a6 improvement: video link in readme 2020-05-21 18:10:04 +02:00
timokoesters d95e8b4880 fix: problem with to-device for all devices 2020-05-21 13:52:54 +02:00
timokoesters 43478a5870 fix: send correct membership events when joining / creating rooms 2020-05-20 09:24:44 +02:00
timokoesters 8df2a1a072 improvement: add room topic to public room dir 2020-05-20 00:12:07 +02:00
timokoesters e0fccffde0 fix: changing avatar url now sends room events 2020-05-19 23:52:02 +02:00
timokoesters ada260bf42 fix: use png for thumbnails 2020-05-19 23:51:37 +02:00
Timo Kösters cf91996336 Merge pull request 'fix: riot sometimes freaks out when refreshing' (#18) from media into master 2020-05-19 23:02:42 +02:00
timokoesters eb4af85765 fix: riot sometimes freaks out when refreshing 2020-05-19 22:56:28 +02:00
Timo Kösters 108d8988d8 Merge pull request 'feat: image thumbnails' (#17) from media into master 2020-05-19 20:01:13 +02:00