Commit graph

1013 commits

Author SHA1 Message Date
Devin Ragotzy
c30cc50a0b Switch ruma to a commit from next 2021-07-02 06:40:40 -04:00
Timo Kösters
5f6b0c673c Merge branch 'feature/proxy' into 'master'
add support for arbitrary proxies

See merge request famedly/conduit!54
2021-07-01 19:46:18 +00:00
Aiden McClelland
c53cc03ff8
address pr comments 2021-07-01 13:38:25 -06:00
Timo Kösters
af903ceac3 Merge branch 'ci-build-artifacts-1' into 'master'
Generate binaries for 3 architectures in the CI

See merge request famedly/conduit!94
2021-07-01 19:06:40 +00:00
Aiden McClelland
f25f61d4a9
fix errors introduced by rebase 2021-07-01 12:48:12 -06:00
Aiden McClelland
b2d5516058 add support for arbitrary proxies 2021-07-01 12:41:12 -06:00
Devin Ragotzy
1bb84a8e2d Fix docs for fetch_and_handle_events 2021-06-30 07:48:16 -04:00
Devin Ragotzy
98f1480e2b
Remove auth_cache using a closure to fetch events in state-res 2021-06-30 12:54:19 +02:00
Timo Kösters
cc9111059d Merge branch 'search-impovements' into 'master'
improvement: /search works for multiple rooms

See merge request famedly/conduit!106
2021-06-30 08:32:55 +00:00
Timo Kösters
05821d6fd5
improvement: pdu cache, /sync cache 2021-06-30 10:31:34 +02:00
Devin Ragotzy
09a8737f24 Export conduits Config struct and fix clipp warningsy 2021-06-29 16:02:12 -04:00
Timo Kösters
dcac1361ec
improvement: /search works for multiple rooms 2021-06-21 15:21:00 +02:00
Timo Kösters
fee7d3d2e3 Merge branch 'allow_appservice_registration' into 'master'
Always allow appservices to register new users

See merge request famedly/conduit!105
2021-06-21 10:15:48 +00:00
Timo Kösters
1a70ea5702 Merge branch 'upgrade-deps' into 'master'
Upgrade Ruma

See merge request famedly/conduit!104
2021-06-21 10:14:12 +00:00
phesch
637d9d3b6f Always allow appservices to register new users 2021-06-19 16:12:05 +02:00
Jonas Platte
808741bcb6
Remove unnecessary Option-wrapping and successive unwrapping 2021-06-17 20:44:29 +02:00
Jonas Platte
b291e76572
Use try operator for Option more 2021-06-17 20:37:07 +02:00
Jonas Platte
f3e630c064
Fix lots of clippy lints 2021-06-17 20:34:14 +02:00
Jonas Platte
af2ce5803e
Remove pointless double deserialization 2021-06-17 20:29:02 +02:00
Jonas Platte
7fa54e4411
Use Ruma-provided default power levels for shorter code 2021-06-17 20:14:37 +02:00
Jonas Platte
f6046871f4
Upgrade Ruma 2021-06-17 20:12:36 +02:00
Timo Kösters
2ac7b6d411 Merge branch 'event_auth' into 'master'
feat: /event_auth

Closes #43

See merge request famedly/conduit!103
2021-06-14 09:44:07 +00:00
Timo Kösters
67f9592b17
feat: /event_auth 2021-06-14 11:36:40 +02:00
Timo Kösters
07271b7725 Merge branch 'roomdirfilter' into 'master'
improvement: filter our room directory

Closes #35

See merge request famedly/conduit!102
2021-06-14 09:33:20 +00:00
Timo Kösters
77a23f8969
improvement: filter our room directory
Fixes #35
2021-06-14 11:26:41 +02:00
Timo Kösters
01e01bf25e Merge branch 'state' into 'master'
feat: /state

Closes #47

See merge request famedly/conduit!101
2021-06-14 09:23:22 +00:00
Timo Kösters
3c9ea55938
feat: /state 2021-06-14 11:01:12 +02:00
Timo Kösters
cf493f2b5b Merge branch 'userdir' into 'master'
User directory improvements

See merge request famedly/conduit!100
2021-06-12 16:52:49 +00:00
Timo Kösters
e8f6708927
improvement: show more users in our user directory 2021-06-12 18:40:33 +02:00
Timo Kösters
8c6bcc47bf Merge branch 'rocksdb' into 'master'
Swappable database backend

See merge request famedly/conduit!98
2021-06-12 14:25:03 +00:00
Timo Kösters
cd4bc520d8
improvement: feature flags for sled, rocksdb 2021-06-12 15:13:04 +02:00
hamidreza kalbasi
2078af59d8
fix fmt problems 2021-06-09 22:22:05 +02:00
hamidreza kalbasi
2385bd1cfd
add migrations 2021-06-09 22:22:05 +02:00
hamidreza kalbasi
affa124864
create media folder in init 2021-06-09 22:22:05 +02:00
hamidreza kalbasi
ff841b73c5
use .keys() and remove unneccery .to_vec() 2021-06-09 22:22:04 +02:00
hamidreza kalbasi
804105479c
fix fmt and clippy warnings 2021-06-09 22:22:04 +02:00
hamidreza kalbasi
972caacdc2
put media in filesystem 2021-06-09 22:22:04 +02:00
Timo Kösters
d0ee823254
feat: swappable database backend 2021-06-09 22:21:52 +02:00
Timo Kösters
81715bd84d Merge branch 'account' into 'master'
Fix account and media bugs

See merge request famedly/conduit!97
2021-06-08 07:22:32 +00:00
Timo Kösters
b3cec1d20d Merge branch 'master' into 'master'
Fix ruma dependency

Closes #95

See merge request famedly/conduit!96
2021-06-05 06:14:55 +00:00
Damian Poddebniak
bb7a4220d3 Fix ruma dependency 2021-06-04 20:18:03 +02:00
Jonas Fowl
b84c66daba Generate binaries for 3 architectures in the CI
The result is stored in the gitlab package registry
2021-06-01 00:58:50 +00:00
Timo Kösters
e1e529d818
fix: don't apply push rules for users of other homeservers 2021-05-30 22:01:12 +02:00
Timo Kösters
88cf043f94
fix: deactivate accounts that should be deactivated 2021-05-30 21:56:36 +02:00
Timo Kösters
bff68e595b Merge branch 'account' into 'master'
fix: putting global account data works now

Closes #92

See merge request famedly/conduit!93
2021-05-29 09:14:47 +00:00
Timo Kösters
59dd3676d5
fix: putting global account data works now 2021-05-29 10:53:03 +02:00
Timo Kösters
1fa7ff2eb1 Merge branch 'claim' into 'master'
feat: implement /claim, handle to-device events

See merge request famedly/conduit!92
2021-05-28 21:36:46 +00:00
Timo Kösters
deacdf6f58
fix: is_direct for locally invited users 2021-05-28 22:53:00 +02:00
Timo Kösters
5b5cc0574e
feat: implement /claim, handle to-device events 2021-05-28 13:46:15 +02:00
Timo Kösters
953f2b005f Merge branch 'specify-and-document-msrv' into 'master'
Specify the minimum required Rust version in the manifest

See merge request famedly/conduit!91
2021-05-28 07:49:06 +00:00