Jason Volk
6b94b7bd68
Merge branch 'next' into 'next'
...
fix race conditions
See merge request famedly/conduit!711
2025-03-03 18:10:54 +00:00
Matthias Ahouansou
3bbf2cda3e
Merge branch 'enforce-valid-keys-uploaded' into 'next'
...
fix: check that keys uploaded by clients are valid
See merge request famedly/conduit!737
2025-02-27 22:08:48 +00:00
Matthias Ahouansou
be3187fda7
fix: check that keys uploaded by clients are valid
...
clients uploading invalid keys can cause errors later when trying to add signatures
2025-02-27 00:38:21 +00:00
Matthias Ahouansou
a3386f405e
Merge branch 'restricted-make-send-join' into 'next'
...
feat: support /make_join and /send_join for restricted rooms
Closes #393 and #380
See merge request famedly/conduit!618
2025-02-26 20:47:23 +00:00
Matthias Ahouansou
5b47e0f3d4
Merge branch 'clearer-error-content-disposition-migration' into 'next'
...
make error if content disposition migration fails clearer, as well as logging the name of the responsible file
See merge request famedly/conduit!736
2025-02-26 18:01:44 +00:00
Matthias Ahouansou
86b6551dee
make error if content disposition migration fails clearer, as well as logging the name of the responsible file
2025-02-26 16:42:02 +00:00
Matthias Ahouansou
55ec39c47e
feat(federation): support /make_join and /send_join for restricted rooms
2025-02-26 16:04:07 +00:00
Matthias Ahouansou
4942cc8e55
refactor: remove unecessery async
2025-02-25 14:08:57 +00:00
Matthias Ahouansou
fdfc5cbf7c
Merge branch 'upgrade-ruma' into 'next'
...
chore: upgrade ruma
Closes #487
See merge request famedly/conduit!735
2025-02-25 10:24:08 +00:00
Matthias Ahouansou
2a7aa6242f
chore: upgrade ruma
2025-02-24 23:56:12 +00:00
Matthias Ahouansou
406367b4f2
chore: upgrade rust
...
this is needed for recent versions of ruma
2025-02-23 16:22:34 +00:00
Matthias Ahouansou
3686f6d260
remove unused backends
...
they have been disabled for a long time, and are unlikely to ever make a comeback
2025-02-23 15:49:29 +00:00
Matthias Ahouansou
e20dd1469a
Merge branch 'error-parse-image-thumbnail' into 'next'
...
fix(media): return an error when content is failed to be parsed as an image
See merge request famedly/conduit!734
2025-02-04 16:37:26 +00:00
Matthias Ahouansou
30855cef81
fix(media): return an error when content is failed to be parsed as an image
2025-02-04 16:21:14 +00:00
Matthias Ahouansou
7963a9d23f
Merge branch 'turn-config' into 'next'
...
feat(turn): move config to table & error when no config is set
See merge request famedly/conduit!733
2025-02-04 15:43:14 +00:00
Matthias Ahouansou
dbc1daaefb
feat(turn): move config to table & error when no config is set
2025-02-04 14:37:30 +00:00
Matthias Ahouansou
e952522a39
Merge branch 'Glandos-next-patch-05490' into 'next'
...
nginx uses $host instead of $http_host
See merge request famedly/conduit!727
2024-11-03 23:57:29 +00:00
Matthias Ahouansou
ca9a50fa8d
Merge branch 'next' into 'next'
...
replace archived 'crates' with 'dependi'
See merge request famedly/conduit!721
2024-11-03 23:57:26 +00:00
Glandos
8e52ff7560
nginx uses $host instead of $http_host
...
See https://trac.nginx.org/nginx/ticket/2468#comment:1
2024-10-24 15:22:28 +00:00
Matthias Ahouansou
12ada1c86a
Merge branch 'federation-hierarchy' into 'next'
...
feat(spaces): hierarchy over federation
Closes #410 and #394
See merge request famedly/conduit!598
2024-10-11 13:32:26 +00:00
Matthias Ahouansou
ea27da8293
Merge branch 'config_tables_with_env_vars' into 'next'
...
re-add well-known table, while still allowing individual values to be set with...
See merge request famedly/conduit!726
2024-10-11 13:10:08 +00:00
Matthias Ahouansou
56a51360e0
feat(spaces): hierarchy over federation
...
fix(spaces): deal with hierarchy recursion
fix(spaces): properly handle max_depth
refactor(spaces): token scheme to prevent clients from modifying max_depth and suggested_only
perf(spaces): use tokens to skip to room to start populating results at
feat(spaces): request hierarchy from servers in via field of child event
2024-10-11 00:04:54 +01:00
Matthias Ahouansou
de323cbecb
re-add well-known table, while still allowing individual values to be set with env vars without double underscores
2024-10-10 16:02:39 +01:00
Andrey Sidorkin
bd771b6fa5
Merge branch conduit:next into next
2024-10-10 12:49:33 +00:00
Matthias Ahouansou
a9ff97e527
Merge branch 'quiet-content-disposition' into 'next'
...
fix: remove content-disposition debug prints
See merge request famedly/conduit!725
2024-10-10 07:49:17 +00:00
Laurențiu Nicola
a2b72f48b9
fix: remove content-disposition debug prints
2024-10-08 19:41:04 +03:00
Timo Kösters
3c93c81204
Merge branch 'docs' into 'next'
...
fix: config options for well_known have changed
Closes #474
See merge request famedly/conduit!723
2024-10-07 00:00:34 +00:00
Timo Kösters
6767ca8bc8
fix: config options for well_known have changed
2024-10-07 00:03:35 +02:00
Timo Kösters
f8d7ef04e6
Merge branch 'bump' into 'next'
...
Bump version
See merge request famedly/conduit!722
2024-10-06 14:17:22 +00:00
Timo Kösters
892fb8846a
Bump version
2024-10-06 14:18:54 +02:00
Random
a65848c00a
replace archived 'crates' with 'dependi'
2024-10-05 12:51:40 +03:00
Timo Kösters
bca8d1f70f
Merge branch 'mediafixes' into 'next'
...
fix: old media used spaces in content disposition without quotes
See merge request famedly/conduit!717
2024-09-25 11:53:05 +00:00
Timo Kösters
65fe6b0ab5
fix: Empty content dispositions could create problems
2024-09-25 09:06:43 +02:00
Timo Kösters
fea85b0894
fix: Migration typo for media
2024-09-24 23:07:19 +02:00
Timo Kösters
a7405cddc0
fix: Matrix media repo
2024-09-24 19:43:26 +02:00
Timo Kösters
3df21e8257
fix: old media used spaces in content disposition without quotes
2024-09-24 16:46:32 +02:00
Timo Kösters
e4d6202840
Merge branch 'config-env-var-split' into 'next'
...
feat(config): split on __, allowing for setting individual values in a table
See merge request famedly/conduit!706
2024-09-21 14:51:39 +00:00
Timo Kösters
c4810a3a08
Merge branch 'well-know-fix' into 'next'
...
Fix parsing of CONFIG_WELL_KNOW_* env variables
See merge request famedly/conduit!718
2024-09-21 14:50:25 +00:00
Timo Kösters
73d0536cd3
Merge branch 'braid/msc3916-verson-response' into 'next'
...
fix: add missing msc3916 unstable feature in version response
Closes #473
See merge request famedly/conduit!720
2024-09-21 14:49:16 +00:00
The one with the braid
a6797ca0a2
fix: add missing msc3916 unstable feature in version response
...
Fixes : #473
Signed-off-by: The one with the braid <info@braid.business>
2024-09-21 10:54:01 +02:00
Leonardo José
cdd03dfec0
Fix parsing of CONFIG_WELL_KNOW_* env variables into the internal configuration object
2024-09-12 03:33:49 +00:00
Matthias Ahouansou
2bab8869d0
Merge branch 'authenticated-media' into 'next'
...
feat: authenticated media
See merge request famedly/conduit!716
2024-08-28 10:59:41 +00:00
Matthias Ahouansou
cbd3b07ca7
feat(media): use authenticated endpoints when fetching remote media
2024-08-28 11:25:28 +01:00
Matthias Ahouansou
27d6d94355
feat: add support for authenticated media requests
2024-08-28 11:25:28 +01:00
Matthias Ahouansou
a3716a7d5a
chore: upgrade request client matrix version
...
this is needed so that new endpoints use stable paths
2024-08-28 11:25:28 +01:00
Matthias Ahouansou
a9c3867287
Merge branch 'content-disposition-type' into 'next'
...
chore: Use Content-Disposition type for HTTP header
Closes #463
See merge request famedly/conduit!713
2024-08-22 18:36:25 +00:00
avdb13
423b0928d5
use ruma content disposition type in place of string
...
Co-Authored-By: Matthias Ahouansou <matthias@ahouansou.cz>
2024-08-22 19:03:32 +01:00
Matthias Ahouansou
44dd21f432
Merge branch 'TheDidek1-next-patch-00204' into 'next'
...
Update docs to point at new Synapse location
See merge request famedly/conduit!715
2024-07-19 08:58:05 +00:00
Dawid Rejowski
75a0f68349
Update docs to point at new Synapse location
2024-07-18 19:58:27 +00:00
Matthias Ahouansou
8abab8c8a0
Merge branch 'Crftbt-next-patch-43247' into 'next'
...
Update docker.md specifying port so that others don't also run into trying to...
See merge request famedly/conduit!712
2024-07-10 08:36:34 +00:00
