cotugno/conduit
2
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-17 18:58:17 -07:00
Code Issues Packages Projects Releases Wiki Activity
1,175 Commits 49 Branches 8 Tags 16 MiB
9e77f7617c
Commit Graph

1175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Timo Kösters
4732aa6782 Merge branch 'invalid_utf8' into 'master' 
Return proper error in case of invalid UTF-8

See merge request famedly/conduit!110
 2021-07-11 13:44:27 +00:00
Kurt Roeckx
699f77671f Return proper error in case of invalid UTF-8 in json_body 
json_body is used in places that need authentication. In
case an unknown field is set, Ruma doesn't parse the field
and so doesn't give an error on invalid UTF-8. But Conduit
has parsed and on error makes json_body None. Return an
error to the client instead of generating an internal error.
 2021-07-11 14:47:13 +02:00
Timo Kösters
fcfb9b51de Merge branch 'fix-ci-failing-duplicate-nightly-release' into 'master' 
Fix: Duplicate releases don't work, remove nightly

Closes #100

See merge request famedly/conduit!113
 2021-07-11 11:43:48 +00:00
Jonas Zohren
36681dd3ac Fix: Duplicate releases don't work, remove nightly 2021-07-11 11:43:48 +00:00
Timo Kösters
13c0beafa6 Merge branch 'lib-fix' into 'master' 
Export conduits Config struct and fix clippy warnings

See merge request famedly/conduit!99
 2021-07-11 11:42:07 +00:00
Timo Kösters
a313a93ff5 Merge branch 'master' into 'master' 
Change default port in docker to the new

See merge request famedly/conduit!115
 2021-07-11 11:41:12 +00:00
Daniel Wiesenberg
6a96cfaac1 Change default port in docker to the new 
conduit default port 6167 and fix the docker healthcheck
 2021-07-06 10:43:33 +02:00
Timo Kösters
787e18b2a4 Merge branch 'jfowl-master-patch-57056' into 'master' 
Fix: Nightly release tag name should not be a branch name

See merge request famedly/conduit!112
 2021-07-02 15:18:26 +00:00
Jonas Zohren
fcc30f059e Fix: Nightly release tag name should not be a branch name 
According to tulir this breaks the GitLab Matrix bot, and nightly is a better match anyway
 2021-07-02 14:58:00 +00:00
Timo Kösters
f1a2aa3a94 Merge branch 'jfowl-master-patch-97252' into 'master' 
Publish master builds as nightly releases & also build debs

See merge request famedly/conduit!111
 2021-07-02 12:26:27 +00:00
Jonas Zohren
a7cb1c999a Publish master builds as nightly releases & also build debs 2021-07-02 12:26:26 +00:00
Timo Kösters
5711467ad9 Merge branch 'state-res-closure' into 'master' 
Remove auth_cache using a closure to fetch events in state-res

See merge request famedly/conduit!108
 2021-07-02 10:56:21 +00:00
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