conduit

oss/conduit

Fork 0

mirror of https://gitlab.com/famedly/conduit.git synced 2025-06-27 16:35:59 +00:00

Commit graph

147161fda1 Merge branch 'ruma-exhaustive-env-var' into 'next' Matthias Ahouansou 2025-03-15 00:33:14 +00:00
0d8a4f4d10

switch to env var for enabling ruma exhaustive types Matthias Ahouansou 2025-03-15 00:31:47 +00:00
d0607b6459

chore(ruma): bump Matthias Ahouansou 2025-03-15 00:29:52 +00:00
244dbbe6dd Merge branch 'appservice-ping' into 'next' Matthias Ahouansou 2025-03-08 14:39:52 +00:00
9b1424933a Merge branch 'appservice-ping' into 'next' Matthias Ahouansou 2025-03-08 13:29:26 +00:00
dc5abd6f3b

feat(appservice): pinging Matthias Ahouansou 2025-03-08 11:26:17 +00:00
b726ccaab8

chore(ruma): upgrade Matthias Ahouansou 2025-03-08 11:35:21 +00:00
4dc15a4605

refactor: set send_request matrix versions in a single constant Matthias Ahouansou 2025-03-08 13:19:45 +00:00
42d8e88c74 Merge branch 'membership-refactor' into 'next' Matthias Ahouansou 2025-03-03 19:16:05 +00:00
6b94b7bd68 Merge branch 'next' into 'next' Jason Volk 2025-03-03 18:10:54 +00:00
d7f0b1b500 Merge branch 'membership-refactor' into 'next' Matthias Ahouansou 2025-03-03 18:07:29 +00:00
21af83ea72

feat: knocking Matthias Ahouansou 2025-03-01 19:17:37 +00:00
f4d90e9989

refactor: move duplicate code and some other small optimizations Matthias Ahouansou 2025-03-01 19:17:32 +00:00
8acacdebc8

chore: bump ruma & rust Matthias Ahouansou 2025-03-01 02:44:24 +00:00
d0c1b920ae

feat(federation): implement /make_leave and /send_leave Matthias Ahouansou 2025-02-28 14:09:33 +00:00
ca76e92abd

refactor federation membership handshake endpoints, reducing duplication Matthias Ahouansou 2024-10-31 16:23:54 +00:00
70fee705eb Merge branch 'unstable-msc4125' into 'next' Matthias Ahouansou 2025-02-28 19:47:52 +00:00
3bbf2cda3e Merge branch 'enforce-valid-keys-uploaded' into 'next' Matthias Ahouansou 2025-02-27 22:08:48 +00:00
697ede817f Merge branch 'enforce-valid-keys-uploaded' into 'next' Matthias Ahouansou 2025-02-27 00:38:31 +00:00
be3187fda7

fix: check that keys uploaded by clients are valid Matthias Ahouansou 2025-02-27 00:38:21 +00:00
a3386f405e Merge branch 'restricted-make-send-join' into 'next' Matthias Ahouansou 2025-02-26 20:47:23 +00:00
c2ad8ab85e Merge branch 'restricted-make-send-join' into 'next' Matthias Ahouansou 2025-02-26 19:13:21 +00:00
5b47e0f3d4 Merge branch 'clearer-error-content-disposition-migration' into 'next' Matthias Ahouansou 2025-02-26 18:01:44 +00:00
c2d07ad837 Merge branch 'clearer-error-content-disposition-migration' into 'next' Matthias Ahouansou 2025-02-26 16:43:11 +00:00
86b6551dee

make error if content disposition migration fails clearer, as well as logging the name of the responsible file Matthias Ahouansou 2025-02-26 16:42:02 +00:00
55ec39c47e

feat(federation): support /make_join and /send_join for restricted rooms Matthias Ahouansou 2024-04-09 14:36:50 +01:00
4942cc8e55

refactor: remove unecessery async Matthias Ahouansou 2024-07-01 15:12:44 +01:00
fdfc5cbf7c Merge branch 'upgrade-ruma' into 'next' Matthias Ahouansou 2025-02-25 10:24:08 +00:00
cff72b57b6 Merge branch 'upgrade-ruma' into 'next' Matthias Ahouansou 2025-02-25 10:05:59 +00:00
2a7aa6242f

chore: upgrade ruma Matthias Ahouansou 2025-02-23 05:35:28 +00:00
406367b4f2

chore: upgrade rust Matthias Ahouansou 2025-02-23 13:50:02 +00:00
3686f6d260

remove unused backends Matthias Ahouansou 2025-02-23 15:41:40 +00:00
b9c1cd6938 Merge branch 'shekohex/fix-media-file-name' into 'next' Shady Khalifa 2025-02-05 02:58:04 +00:00
e20dd1469a Merge branch 'error-parse-image-thumbnail' into 'next' Matthias Ahouansou 2025-02-04 16:37:26 +00:00
90b77b62e2 Merge branch 'error-parse-image-thumbnail' into 'next' Matthias Ahouansou 2025-02-04 16:22:36 +00:00
30855cef81

fix(media): return an error when content is failed to be parsed as an image Matthias Ahouansou 2025-02-04 14:36:07 +00:00
7963a9d23f Merge branch 'turn-config' into 'next' Matthias Ahouansou 2025-02-04 15:43:14 +00:00
77e13910c2 Merge branch 'turn-config' into 'next' Matthias Ahouansou 2025-02-04 14:37:40 +00:00
dbc1daaefb

feat(turn): move config to table & error when no config is set Matthias Ahouansou 2024-05-28 14:30:46 +01:00
98f37acbe0 Merge branch 'patch-1' into 'next' Việt Hoàn Nguyên 2024-12-31 19:20:54 +00:00
ddc9167948 Delete engage.toml Việt Hoàn Nguyên 2024-12-31 19:20:46 +00:00
c704a364cd Give example server name Rik Huijzer 2024-12-18 21:32:19 +01:00
26d43a81be Merge branch 'Venkateshbodem-chore/format-nix-patch-97160' into 'chore/format-nix' Venkateshbodem 2024-11-25 09:00:34 +00:00
1a377a41e1 Update .gitlab-ci.yml Venkateshbodem 2024-11-25 09:00:12 +00:00
65196f560b Merge branch 'registration-default-rooms' into 'next' avdb 2024-11-16 13:11:46 +00:00
4fd465657c Merge branch 'WIP_backup' into 'next' tglman 2024-11-13 05:42:45 +00:00
a5359009fa Merge branch 'make-send-leave' into 'next' Matthias Ahouansou 2024-11-07 00:29:07 +00:00
775e4ef3f9 Merge branch 'url_previews' into 'next' Steven Vergenz 2024-11-04 18:52:53 +00:00
0e34f07d11 Fix lint/clippy Steven Vergenz 2024-11-04 10:52:43 -08:00
69116b16df Merge branch 'next' into 'next' charludo 2024-11-04 12:51:23 +00:00
f667a962cb Merge branch '3pid-email' into 'next' avdb 2024-11-04 11:42:21 +00:00
6c020b690f Merge branch 'refresh-tokens' into 'next' avdb 2024-11-04 09:05:59 +00:00
da543a726e Merge branch 'sso-oidc' into 'next' avdb 2024-11-04 01:22:43 +00:00
e952522a39 Merge branch 'Glandos-next-patch-05490' into 'next' Matthias Ahouansou 2024-11-03 23:57:29 +00:00
ca9a50fa8d Merge branch 'next' into 'next' Matthias Ahouansou 2024-11-03 23:57:26 +00:00
03653d6a10 Fix domain lookups Steven Vergenz 2024-10-31 14:16:09 -07:00
7dd9bda17b Do spamhaus check Steven Vergenz 2024-10-31 11:21:16 -07:00
b76357c80e More flexible preview config Steven Vergenz 2024-10-31 10:28:51 -07:00
6789ed336e Get rid of allowlist check allocs Steven Vergenz 2024-10-31 09:34:10 -07:00
6a4cff1661 Rate limit => NotFound Steven Vergenz 2024-10-30 21:22:13 -07:00
c8d5b05855 Preview titles/images required Steven Vergenz 2024-10-30 21:16:24 -07:00
839498ada7 Parse URL only once Steven Vergenz 2024-10-30 16:48:38 -07:00
9ddfb8cb5e Merge remote-tracking branch 'origin/next' into url_previews Steven Vergenz 2024-10-30 15:22:03 -07:00
8e52ff7560 nginx uses $host instead of $http_host Glandos 2024-10-24 15:22:28 +00:00
12ada1c86a Merge branch 'federation-hierarchy' into 'next' Matthias Ahouansou 2024-10-11 13:32:26 +00:00
ea27da8293 Merge branch 'config_tables_with_env_vars' into 'next' Matthias Ahouansou 2024-10-11 13:10:08 +00:00
56a51360e0

feat(spaces): hierarchy over federation Matthias Ahouansou 2024-03-02 11:12:22 +00:00
dd75a7ba84 feat: add implementation to export and import low level data in json Tglman 2023-08-30 22:35:04 +01:00
0f1c3222ed test: add test for exporting and importing data from tree store Tglman 2023-08-27 18:56:09 +01:00
5e52438b6f feat: additional implementation of export logic Tglman 2023-08-27 16:32:17 +01:00
6c8da70122 feat: first implementation of KeyValue data export Tglman 2023-08-22 01:47:11 +01:00
c901ac0bb8 fix: make heed implementation compile Tglman 2023-08-22 00:34:28 +01:00
4a087e4873 chore: fix tests after refactor Tglman 2022-10-26 21:27:15 +01:00
2d641b62a6 fix:update implementation to recent changes on next Tglman 2022-02-12 23:39:45 +00:00
62f04d22e1 test:add entry for seamless remove of not existing key from database Tglman 2022-02-01 20:58:51 +00:00
5591ce3e1b test: add tests for rocksdb and persy impl Tglman 2022-01-22 14:18:47 +00:00
5a66ffd9e6 refactor: changed tree specific impls to be one liner Tglman 2022-01-22 14:07:50 +00:00
326c345811 test:add replace test and refactor for reduce specific test boilerplate Tglman 2022-01-22 13:55:58 +00:00
e770de3d3d test: add abstract test implementations and specific implementation for sqlite Tglman 2022-01-15 14:07:16 +00:00
de323cbecb

re-add well-known table, while still allowing individual values to be set with env vars without double underscores Matthias Ahouansou 2024-10-10 16:02:39 +01:00
bd771b6fa5 Merge branch conduit:next into next Andrey Sidorkin 2024-10-10 12:49:33 +00:00
a9ff97e527 Merge branch 'quiet-content-disposition' into 'next' Matthias Ahouansou 2024-10-10 07:49:17 +00:00
a2b72f48b9 fix: remove content-disposition debug prints Laurențiu Nicola 2024-10-08 19:41:04 +03:00
d9d5fd9219

Update docs/configuration.md default, link with src/config/mod.rs Herman Rimm 2024-10-07 09:55:14 +02:00
3c93c81204 Merge branch 'docs' into 'next' Timo Kösters 2024-10-07 00:00:34 +00:00
6767ca8bc8

fix: config options for well_known have changed Timo Kösters 2024-10-07 00:02:36 +02:00
f8d7ef04e6 Merge branch 'bump' into 'next' v0.9.0 Timo Kösters 2024-10-06 14:17:22 +00:00
892fb8846a

Bump version Timo Kösters 2024-10-06 14:18:54 +02:00
a65848c00a replace archived 'crates' with 'dependi' Random 2024-10-05 12:51:40 +03:00
bca8d1f70f Merge branch 'mediafixes' into 'next' Timo Kösters 2024-09-25 11:53:05 +00:00
65fe6b0ab5

fix: Empty content dispositions could create problems Timo Kösters 2024-09-25 09:06:43 +02:00
fea85b0894

fix: Migration typo for media Timo Kösters 2024-09-24 23:00:37 +02:00
a7405cddc0

fix: Matrix media repo Timo Kösters 2024-09-24 18:48:48 +02:00
3df21e8257

fix: old media used spaces in content disposition without quotes Timo Kösters 2024-09-04 13:01:23 +02:00
e4d6202840 Merge branch 'config-env-var-split' into 'next' Timo Kösters 2024-09-21 14:51:39 +00:00
c4810a3a08 Merge branch 'well-know-fix' into 'next' Timo Kösters 2024-09-21 14:50:25 +00:00
73d0536cd3 Merge branch 'braid/msc3916-verson-response' into 'next' Timo Kösters 2024-09-21 14:49:16 +00:00
a6797ca0a2 fix: add missing msc3916 unstable feature in version response The one with the braid 2024-09-21 10:53:57 +02:00
f4cb2e0bdd

Allow TURN secret to be read from file charludo 2024-09-12 17:37:34 +02:00
cdd03dfec0 Fix parsing of CONFIG_WELL_KNOW_* env variables into the internal configuration object Leonardo José 2024-09-12 03:33:49 +00:00