Timo Kösters
|
b1991c8f4f
|
Merge branch 'Nyaaori/rejoin-fix' into 'next'
Rejoin over federation if we are not participating
See merge request famedly/conduit!399
|
2022-10-15 09:56:55 +00:00 |
|
Timo Kösters
|
6f7f2820ce
|
Merge branch 'Nyaaori/restricted-join-fix' into 'next'
Fix doing restricted joins into rooms we are not participating in
See merge request famedly/conduit!398
|
2022-10-15 09:50:25 +00:00 |
|
Nyaaori
|
e9697f13d6
|
Handle initiating restricted joins over federation
Allows Conduit users to join restricted rooms if we are not currently participating
|
2022-10-15 10:46:50 +02:00 |
|
Nyaaori
|
3b0aa23fdf
|
Rejoin room over federation if we are not participating in it; do not include invited users in participating servers calculation
|
2022-10-15 10:38:30 +02:00 |
|
Timo Kösters
|
aca6218c0a
|
Merge branch 'unrecognizedmethods' into 'next'
fix: send unrecognized error on wrong http methods
See merge request famedly/conduit!397
|
2022-10-15 08:35:39 +00:00 |
|
Timo Kösters
|
3a45628e1d
|
fix: send unrecognized error on wrong http methods
|
2022-10-15 00:28:43 +02:00 |
|
Tglman
|
842feabced
|
fix: update persy implementation after refactor
|
2022-10-13 20:02:36 +01:00 |
|
Charles Hall
|
286936db32
|
msrv is 1.63 in Cargo.toml; use that
|
2022-10-13 08:26:46 -07:00 |
|
Charles Hall
|
bf7c4b4001
|
update rust to avoid a cargo problem
We were hitting [this bug][0] when trying to select a version for clap
^4.
[0]: https://github.com/rust-lang/cargo/issues/10623
|
2022-10-13 08:06:49 -07:00 |
|
Timo Kösters
|
c948324cf2
|
Merge branch 'fix-admin-help' into 'next'
fix `@conduit help` not working in the admin room
See merge request famedly/conduit!392
|
2022-10-13 11:15:49 +00:00 |
|
Timo Kösters
|
ce188daccb
|
Merge branch 'conduit-lower-default-log-level' into HEAD
|
2022-10-13 13:13:03 +02:00 |
|
exin
|
98702da4e6
|
Lower default log level for docker
|
2022-10-13 13:11:15 +02:00 |
|
exin
|
92f7f0c849
|
Lower log level commented config options
|
2022-10-13 13:11:15 +02:00 |
|
exin
|
7451abe3ea
|
Lower default log level for docker and debian
|
2022-10-13 13:11:14 +02:00 |
|
exin
|
3e6c66b899
|
Fix formatting
|
2022-10-13 13:11:14 +02:00 |
|
exin
|
3a40bf8ae0
|
Add error for invalid log config
Log config falls back to "warn"
|
2022-10-13 13:11:14 +02:00 |
|
exin
|
9c922db14b
|
Lower default log level
Update config-example.toml to accordingly
Closes #281
|
2022-10-13 13:11:13 +02:00 |
|
Timo Kösters
|
175fba5739
|
Merge branch 'fix-login-token' into 'next'
fix(client/login): username in lowercase for login by token
See merge request famedly/conduit!380
|
2022-10-13 11:08:04 +00:00 |
|
Timo Kösters
|
f46d64e52f
|
Merge branch 'unstability' into 'next'
Mark unstable versions as unstable in /capabilities
See merge request famedly/conduit!394
|
2022-10-13 09:39:45 +00:00 |
|
Timo Kösters
|
8c6e75a0cd
|
Mark unstable versions as unstable in /capabilities
|
2022-10-13 10:27:42 +02:00 |
|
Timo Kösters
|
c23b4946c5
|
Merge branch 'fixallthebugs' into 'next'
fix: all the e2ee problems
See merge request famedly/conduit!393
|
2022-10-13 08:21:12 +00:00 |
|
Timo Kösters
|
ac52b234fa
|
fix: all the e2ee problems
|
2022-10-13 10:15:35 +02:00 |
|
AndSDev
|
9a47069f45
|
fix(client/login): username in lowercase for login by token
|
2022-10-13 06:40:17 +00:00 |
|
Charles Hall
|
7ef9fe3454
|
add regression tests
This way we don't regress on accident again in the future.
|
2022-10-12 17:58:43 -07:00 |
|
Charles Hall
|
fc852f8be6
|
resolve cargo check --features clap/deprecated
This has no functional effects.
|
2022-10-12 17:55:12 -07:00 |
|
Charles Hall
|
4710f739c0
|
clap v4 turned more things into optional features
So we need to re-enable some things. See their changelog[0] for details.
[0]: https://github.com/clap-rs/clap/blob/master/CHANGELOG.md#migrating
|
2022-10-12 17:55:12 -07:00 |
|
Charles Hall
|
3c20c1b72e
|
fix cargo test
|
2022-10-12 17:55:12 -07:00 |
|
Timo Kösters
|
37eb686b5b
|
Merge branch 'fixfluffy' into 'next'
fix: fluffychat login works again
See merge request famedly/conduit!391
|
2022-10-12 15:37:50 +00:00 |
|
Timo Kösters
|
fdd64fc966
|
fix: fluffychat login works again
|
2022-10-12 17:18:01 +02:00 |
|
Timo Kösters
|
4d982d05af
|
Merge branch 'claimfast' into 'next'
improvement: more efficient /claim
See merge request famedly/conduit!389
|
2022-10-12 09:09:23 +00:00 |
|
Timo Kösters
|
1e725bc548
|
Merge branch 'fixmakejoin' into 'next'
fix: make join should not send event id
See merge request famedly/conduit!390
|
2022-10-12 09:08:58 +00:00 |
|
Timo Kösters
|
dd8f4681a2
|
fix: make join should not send event id
|
2022-10-12 10:57:54 +02:00 |
|
Timo Kösters
|
0290f1f355
|
improvement: more efficient /claim
|
2022-10-12 10:43:30 +02:00 |
|
Timo Kösters
|
cd835fc7a8
|
Merge branch 'initialSyncFix' into 'next'
Initial sync fix
See merge request famedly/conduit!388
|
2022-10-11 21:24:19 +00:00 |
|
Timo Kösters
|
2b70d9604a
|
fix: element gets stuck in /initialSync
|
2022-10-11 23:07:03 +02:00 |
|
Timo Kösters
|
d3968c2fd1
|
fix: bump ruma again to fix state res problems
|
2022-10-11 21:51:20 +02:00 |
|
Timo Kösters
|
8105c5cc60
|
cargo fmt
|
2022-10-11 18:10:51 +02:00 |
|
Timo Kösters
|
d1e5acd7b3
|
fix: don't panic on missing events in state
|
2022-10-11 17:59:49 +02:00 |
|
Timo Kösters
|
68227c06c3
|
fix: state for left rooms
|
2022-10-11 17:10:56 +02:00 |
|
Timo Kösters
|
31d1801912
|
fix: workaround for missing avatars on element and rooms becoming historical
|
2022-10-11 17:10:09 +02:00 |
|
Timo Kösters
|
fb6bfa9753
|
fix: missing field origin error with synapse servers
|
2022-10-11 15:25:10 +02:00 |
|
Timo Kösters
|
c30cc6120b
|
fix: send right errors on make/send join in restricted rooms
|
2022-10-11 11:53:13 +02:00 |
|
Nyaaori
|
2b7c19835b
|
Add room version 10 to experimental versions
|
2022-10-10 15:00:44 +02:00 |
|
Timo Kösters
|
c2a5315e9f
|
Merge branch 'm0dex/fix-signature-upload' into 'next'
fix(client/keys): ignore all but signed keys in signature upload route
See merge request famedly/conduit!378
|
2022-10-10 14:42:23 +02:00 |
|
Jakub Kubík
|
0ddc3c01ef
|
style(client/keys): rename signature key to signed key
|
2022-10-10 14:41:43 +02:00 |
|
Jakub Kubík
|
c15205fb46
|
fix(client/keys): ignore non-signature keys in signature upload route
|
2022-10-10 14:41:00 +02:00 |
|
Jonas Zohren
|
cb837d5a1c
|
Merge branch 'conduit-dockerfile-db-path' into 'next'
Dockerfile: changing DB path to be same as we are using in CI
See merge request famedly/conduit!371
|
2022-10-10 14:40:19 +02:00 |
|
majso
|
18ca2e4c29
|
Dockerfile: changing DB path to be same as we are using in CI
|
2022-10-10 14:39:36 +02:00 |
|
Timo Kösters
|
a10dae38e2
|
Merge branch 'v4' into 'next'
Bump version to 0.4
See merge request famedly/conduit!368
|
2022-10-10 14:38:56 +02:00 |
|
Timo Kösters
|
7cf060ae5b
|
Bump version to 0.4
|
2022-10-10 14:38:17 +02:00 |
|