char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
880 commits 1 branch 0 tags 2.6 MiB
Commit graph

880 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Vadim Zeitlin
f199b51f97 Move the link to cross-compiling guide to DEPLOY.md 2021-05-28 09:42:59 +02:00
Vadim Zeitlin
0f16a79888 Specify the minimum required Rust version in the manifest 
Also mention it in the deployment guide.
 2021-05-27 23:32:33 +02:00
Vadim Zeitlin
6af942814f Fix some typos in the README 2021-05-27 23:32:33 +02:00
Timo Kösters
0805f4ac2a Merge branch 'pdu-success' into 'master' 
fix: also return successful PDUs in /send/:txnId

See merge request famedly/conduit!90
 2021-05-27 21:24:43 +00:00
Gabriel Souza Franco
7db59c550f fix: also return successful PDUs in /send/:txnId 2021-05-27 18:10:48 -03:00
Timo Kösters
25b1cd2683 Merge branch 'stateres' into 'master' 
fix: state resolution bugs

See merge request famedly/conduit!89
 2021-05-27 09:10:53 +00:00
Timo Kösters
daa1fc90a7
fix: state resolution bugs 2021-05-27 10:48:17 +02:00
Timo Kösters
eeb0b59b76 Merge branch 'redaction_quotes' into 'master' 
Fix redacted_because field being sent as a string

Closes #87

See merge request famedly/conduit!88
 2021-05-26 15:58:00 +00:00
phesch
ddcf1a715b Fix redacted_because field being sent as a string 2021-05-26 17:38:30 +02:00
Timo Kösters
d1c0eaf628 Merge branch 'master' into 'master' 
Fix docker-compose trusted_servers env var

See merge request famedly/conduit!87
 2021-05-26 07:03:51 +00:00
Daniel Wiesenberg
8387ceacab Fix docker-compose trusted_servers env var 2021-05-25 21:34:31 +02:00
Timo Kösters
1aec80c57c Merge branch 'logs' into 'master' 
fix: logs for ruma crate

See merge request famedly/conduit!86
 2021-05-24 16:08:56 +00:00
Timo Kösters
aacf6289db
improvement: increase default max concurrent requests 2021-05-24 18:00:39 +02:00
Timo Kösters
57ecd81534
fix: logs for ruma crate 2021-05-24 13:22:30 +02:00
Timo Kösters
ceaeab6816 Merge branch 'federation-errors' into 'master' 
feat: forward federation errors to the client

See merge request famedly/conduit!85
 2021-05-23 18:27:05 +00:00
Timo Kösters
e5c7119516
feat: forward federation errors to the client 2021-05-23 16:46:46 +02:00
Timo Kösters
1939e62814
fmt 2021-05-23 11:11:20 +02:00
Timo Kösters
1ab209736a Merge branch 'forbidden' into 'master' 
fix: Forbidden instead of InvalidParam when joining

See merge request famedly/conduit!84
 2021-05-22 19:56:46 +00:00
Timo Kösters
fd69ac621c
fix: run ci with docker 2021-05-22 21:41:08 +02:00
Timo Kösters
c1b2b468b8
fix: bad except in ruma wrapper 2021-05-22 21:33:31 +02:00
Timo Kösters
7e4dc65747 Merge branch 'master' into 'master' 
Update Dockerfile and docker-compose

See merge request famedly/conduit!39
 2021-05-22 19:26:03 +00:00
Daniel Wiesenberg
634fe04c33 Fix wrong env var name in traefik compose 2021-05-22 20:49:07 +02:00
Timo Kösters
90cd11d850
fix: Forbidden instead of InvalidParam when joining 2021-05-22 18:50:40 +02:00
Daniel Wiesenberg
c6625d83e6 Add CONDUIT_TRUSTED_SERVERS config param 2021-05-22 16:53:48 +02:00
Daniel Wiesenberg
5a7ccbdfab Add CONDUIT_CONFIG to all relevant docker files 
And mention that an empty string can be used to configure
Conduit purely with env vars.
 2021-05-22 16:53:48 +02:00
Daniel Wiesenberg
beb428d866 Update docker command in README 
Mention the need for a config.
 2021-05-22 16:53:48 +02:00
Daniel Wiesenberg
52a96b3d84 Update Dockerfile and docker-compose 
- Dockerfile now tracks the gitlab repository and the master branch.
- docker-compose now points to conduit.toml instead of Rocket.toml and
its env vars were also renamed from ROCKET_ to CONDUIT_.
Furthermore vectorim/riot-web was changed to vectorim/element-web
 2021-05-22 16:53:48 +02:00
Timo Kösters
42c9ba2e5c Merge branch 'appservice-docs' into 'master' 
docs: APPSERVICES setup guide

See merge request famedly/conduit!83
 2021-05-22 13:13:54 +00:00
Timo Kösters
47160e9e06
docs: APPSERVICES setup guide 2021-05-22 13:55:28 +02:00
Timo Kösters
488581cc51 Merge branch 'fix-sync' into 'master' 
fix: too many syncs

See merge request famedly/conduit!82
 2021-05-22 09:39:14 +00:00
Timo Kösters
9b77eb7bb7
fix: too many syncs 2021-05-22 11:31:15 +02:00
Timo Kösters
acfd0aef27 Merge branch 'cargo-deb-packaging-update' into 'master' 
Update cargo-deb packaging for recent changes

See merge request famedly/conduit!61
 2021-05-22 09:03:43 +00:00
Timo Kösters
50348de1dd Merge branch 'improvements' into 'master' 
improvement: federation get_keys and optimize signingkey storage

See merge request famedly/conduit!81
 2021-05-22 08:49:18 +00:00