conduit

oss/conduit

Fork 0

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

Commit graph

dd19877528 Merge branch 'bump-ruma' into 'next' Timo Kösters 2024-06-11 20:59:58 +00:00
ba2a5a6115

chore: bump all dependencies Matthias Ahouansou 2024-04-07 20:46:18 +01:00
c691ff4490 WIP mikoto 2024-06-11 20:53:11 +02:00
bd217c77ca api(knock): server-to-server support mikoto 2024-06-11 20:39:03 +02:00
b5310f714a Merge branch 'generate-config' into 'next' Matthias Ahouansou 2024-06-11 18:19:25 +00:00
75a8d89cfa Merge branch 'refactor-main' into 'next' Charles Hall 2024-06-11 07:48:22 +00:00
a36ccff06a Merge branch 'security-readme' into 'next' Matthias Ahouansou 2024-06-06 21:21:07 +00:00
39b4932725

docs: add security disclosure instructions Matthias Ahouansou 2024-06-06 21:43:10 +01:00
ad6fc93249

fix(media): return an error when content is failed to be parsed as an image Matthias Ahouansou 2024-06-05 13:34:35 +01:00
e270fa57d8 Merge branch 'chore/format-nix' into 'next' Samuel Meenzen 2024-06-04 16:58:45 +00:00
c45e52f45a Merge branch 'media-csp' into 'next' Matthias Ahouansou 2024-06-04 05:31:35 +00:00
1dbb3433e0

fix(media): use csp instead of modifying content-type Matthias Ahouansou 2024-06-03 21:35:20 +01:00
a37d02edde no better solution to allocating other than nesting mikoto 2024-06-03 21:27:38 +02:00
efecb78888 Merge branch 'local-event-non-restricted-room-vers' into 'next' Matthias Ahouansou 2024-06-03 13:28:41 +00:00
f25a0b49eb Merge branch 'recurse-relationships' into 'next' Matthias Ahouansou 2024-06-03 13:19:16 +00:00
b46000fadc

feat: recurse relationships Matthias Ahouansou 2024-04-01 10:52:36 +01:00
914e9d713c fix(api/sync): respect include_leave filter parameter mikoto 2024-06-03 12:36:26 +02:00
7b19618136 Merge branch 'server-user-globals' into 'next' Matthias Ahouansou 2024-05-31 21:27:26 +00:00
19154a9f70

refactor: add server_user to globals Matthias Ahouansou 2024-05-31 21:46:38 +01:00
ec8dfc283c

fix(membership): fallback to locally signed event if the join wasn't a restricted one on send_join response Matthias Ahouansou 2024-05-27 11:47:05 +01:00
be1b8b68a7 Merge branch 'remove-alias-command' into 'next' Matthias Ahouansou 2024-05-29 17:05:45 +00:00
6c2eb4c786

feat(admin): remove alias command Matthias Ahouansou 2024-05-29 17:38:13 +01:00
3df791e030 Merge branch 'ruma-server-util' into 'next' Matthias Ahouansou 2024-05-29 13:16:08 +00:00
9374b74e77

refactor: let ruma-server-util handle X-Matrix parsing Matthias Ahouansou 2024-05-08 16:51:07 +01:00
c732c7c97f Merge branch 'toggle_allow_register' into 'next' Matthias Ahouansou 2024-05-29 09:08:59 +00:00
33c9da75ec Merge branch 'clarify-3pids-are-unsupported' into 'next' Matthias Ahouansou 2024-05-29 08:52:59 +00:00
59d7674b2a

fix: clarify that 3pids are currently unsupported Matthias Ahouansou 2024-05-29 09:36:35 +01:00
6bcc2f80b8

add command to set the allow registration status tony 2023-06-04 00:12:35 +02:00
817f382c5f Merge branch 'openid-api' into 'next' Matthias Ahouansou 2024-05-28 15:11:03 +00:00
a888c7cb16

OpenID routes mikoto 2024-05-28 00:22:11 +02:00
2ffb05d1da Merge branch 'presence' into 'next' Jakub Kubík 2024-05-26 19:05:06 +00:00
962c2097c4 Merge branch 'all-the-lints' into 'next' Matthias Ahouansou 2024-05-26 09:45:49 +00:00
47aadcea1d Merge branch 'membership-reason-fixes' into 'next' Timo Kösters 2024-05-26 07:22:29 +00:00
a39eaf2080 create indices for and filter by contains_url mikoto 2024-05-23 02:19:59 +02:00
7438f2c4e0 contains_url draft mikoto 2024-05-23 00:37:49 +02:00
96074406b1 feat: apply RoomFilter mikoto 2024-05-22 23:26:07 +02:00
ec48df78da wip mikoto 2024-05-07 07:42:10 +02:00
a0c4a639b2 docs(faq): add instructions on how to make a user admin Matthias Ahouansou 2024-05-14 21:20:16 +01:00
49c9a633d0 Style docs to match website Daniel Lo Nigro 2024-05-18 16:46:27 -07:00
aaf746ffdd

fix(sync): correctly update presence properties presence Jakub Kubík 2023-12-20 13:34:45 +01:00
5314221e89

style(presence): use flat_map instead of matching Results in filter Jakub Kubík 2023-12-20 12:04:47 +01:00
ae76052378

feat(presence): add granular allow configuration Jakub Kubík 2023-09-08 14:36:39 +02:00
509afc6b46

feat(presence): implement presence functionality Jakub Kubík 2023-07-10 16:41:00 +02:00
9b8ec21e6e Merge branch 'admin-faq' into 'next' Matthias Ahouansou 2024-05-14 20:37:21 +00:00
e51f60e437

docs(faq): add instructions on how to make a user admin Matthias Ahouansou 2024-05-14 21:20:16 +01:00
de806e5d1b wip mikoto 2024-05-07 07:42:10 +02:00
624d1fcc9a draft: RoomEventFilter mikoto 2024-04-29 20:59:02 +02:00
11990e7524 Merge branch 'admin-hash-sign' into 'next' Matthias Ahouansou 2024-05-09 16:19:40 +00:00
88b24310b5

chore: format nix using alejandra chore/format-nix Samuel Meenzen 2024-05-09 15:20:48 +02:00
41e56baf60

refactor: all the clippy lints all-the-lints Matthias Ahouansou 2024-05-06 17:06:25 +01:00
3ad7675bbf Merge branch 'format-toml' into 'next' Matthias Ahouansou 2024-05-06 20:16:13 +00:00
e2d91e26d6

style: format all toml with taplo Matthias Ahouansou 2024-05-06 19:43:13 +01:00
20d9f3fd5d Merge branch 'media' into 'next' Matthias Ahouansou 2024-05-06 18:37:13 +00:00
965b6df83d

fix: make media response match spec Timo Kösters 2024-05-05 09:35:49 +02:00
9a88386ddf

feat: allow specifying config path via command flag generate-config Matthias Ahouansou 2024-04-19 21:06:58 +01:00
60a2f2d011 feat: generate config Matthias Ahouansou 2024-04-19 20:17:31 +01:00
ecc1bde825

return a concrete error type from try_main Charles Hall 2024-04-19 15:16:55 -07:00
5b35b73b56

reword error message about CONDUIT_CONFIG Charles Hall 2024-04-19 14:31:24 -07:00
2131c36eac

return ExitCode instead of using panic or exit Charles Hall 2024-04-19 14:25:31 -07:00
8876d54d78

feat(admin): add hash-and-sign-event command Matthias Ahouansou 2024-05-03 21:50:45 +01:00
d8badaf64b

fix(membership): always set reason & allow new events if reason changed Matthias Ahouansou 2024-05-05 15:28:18 +01:00
08485ea5e4 Merge branch 'bump-rust-nix' into 'next' Matthias Ahouansou 2024-05-05 12:48:36 +00:00
eec9b9ed87

chore: bump nix Matthias Ahouansou 2024-05-05 13:13:34 +01:00
256dae983b

chore: bump rust Matthias Ahouansou 2024-05-05 13:11:44 +01:00
79c4bb17ca Merge branch 'build-and-cache-everything' into 'next' Matthias Ahouansou 2024-05-05 11:00:12 +00:00
57a24f234d

Revert "ci: temporarily disable CONDUIT_VERSION_EXTRA" Matthias Ahouansou 2024-05-05 10:46:10 +01:00
a4c973e57e

build and cache all packages and CI dependencies Charles Hall 2024-05-05 09:25:39 +01:00
f9953c31fc

Revert "ci: use sh instead of bash" Matthias Ahouansou 2024-05-05 09:28:48 +01:00
6b669d2f4d Merge branch 'only-cache-attic-when-nix' into 'next' Matthias Ahouansou 2024-05-05 08:19:15 +00:00
90c9794221 Merge branch 'sh-not-bash' into 'next' Matthias Ahouansou 2024-05-05 08:12:20 +00:00
358164f49d

ci: only cache attic when nix is available Matthias Ahouansou 2024-05-05 09:01:40 +01:00
70b07dfabf

ci: use sh instead of bash Matthias Ahouansou 2024-05-05 08:53:53 +01:00
d97f5aa3b8 Merge branch 'ci/fastzip' into 'next' Matthias Ahouansou 2024-05-05 05:54:18 +00:00
bed9072a69 Merge branch 'always-cache-attic' into 'next' Matthias Ahouansou 2024-05-05 05:54:16 +00:00
2a2b9554c8

ci: temporarily disable CONDUIT_VERSION_EXTRA Matthias Ahouansou 2024-05-04 21:50:37 +01:00
3d9d975a9f

ci: avoid rebuilding bindgen and friends Matthias Ahouansou 2024-05-04 14:41:30 +01:00
96cc1f6abd

only set CONDUIT_VERSION_EXTRA for final build Charles Hall 2024-05-01 01:05:24 -07:00
55259329a3

make it easy to configure cargo profiles from nix Charles Hall 2024-05-01 12:08:42 -07:00
d796fe7cd3

make it easy to configure cargo features from nix Charles Hall 2024-05-01 00:38:55 -07:00
3336d3f812

factor out nix code into new files via makeScope Charles Hall 2024-04-30 16:00:19 -07:00
c9ee4a920e

always go through inputs Charles Hall 2024-05-04 10:03:49 +01:00
5570f5f3da

ci: faster cache and artifact handling Samuel Meenzen 2024-05-02 15:08:40 +02:00
38200163d6 Merge branch 'error-create-remote-user' into 'next' Matthias Ahouansou 2024-05-02 10:39:46 +00:00
9db1f5a13c

fix(admin): don't allow creation of remote users Matthias Ahouansou 2024-05-02 10:45:04 +01:00
0074aca0ef Merge branch '244-support-well-known' into 'next' Matthias Ahouansou 2024-05-02 09:35:14 +00:00
3ecf835b50

ci: cache attic on artifacts job Matthias Ahouansou 2024-05-02 09:53:53 +01:00
6e913bfec4

docs: delegation Matthias Ahouansou 2024-05-02 09:27:14 +01:00
c1f695653b

feat: support hosting .well-known from Conduit Jakub Kubík 2024-05-02 09:26:43 +01:00
e6b6cc77d1 Merge branch 'verify-x-matrix-destination' into 'next' Matthias Ahouansou 2024-05-02 07:15:20 +00:00
b69a74961b Merge branch 'x-matrix-destination-header' into 'next' Matthias Ahouansou 2024-05-02 06:59:52 +00:00
622aa574b6 Merge branch 'namespace-fixes' into 'next' Matthias Ahouansou 2024-05-02 06:28:01 +00:00
63ba157ef6

feat(auth): check if X-Matrix destination is correct if present Matthias Ahouansou 2024-05-02 07:14:44 +01:00
dfe2916357

feat(federation): add destination field to X-Matrix header Matthias Ahouansou 2024-04-30 09:31:44 +01:00
b4a60c3f9a Merge branch 'ci' into 'next' Matthias Ahouansou 2024-05-02 05:56:19 +00:00
0b217232ac

ci: push attic to binary cache, update nix script Matthias Ahouansou 2024-05-01 21:54:32 +01:00
3b7c001350

ci: use attic.conduit.rs Timo Kösters 2024-04-28 18:10:25 +02:00
9ed531ec89 Merge branch 'feature/forbidden-usernames-rooms' into 'next' Matthias Ahouansou 2024-04-30 20:04:44 +00:00
10412d4be9 Merge branch 'master' into 'next' Matthias Ahouansou 2024-04-28 12:28:25 +00:00
3c8879771c Merge branch 'docker-update-request-size' into 'next' Matthias Ahouansou 2024-04-28 11:47:04 +00:00
4fac7ca169 Merge branch 'backup-faq-docs' into 'next' Matthias Ahouansou 2024-04-28 11:08:22 +00:00