Val Lorentz
b5e21f761b
Merge branch 'next' into 'room-v11'
...
# Conflicts:
# src/service/rooms/timeline/mod.rs
# src/utils/error.rs
2024-04-11 17:34:42 +00:00
Matthias Ahouansou
9e6ce8326f
Remove TODO
2024-04-11 17:21:00 +00:00
Matthias Ahouansou
e88d137bd7
Replace panic!() with unreachable!()
2024-04-11 17:19:42 +00:00
Charles Hall
7f63948db9
Merge branch 'version-extra' into 'next'
...
allow including extra info in `--version` output
See merge request famedly/conduit!601
2024-04-11 14:37:37 +00:00
Timo Kösters
f16bff2466
Merge branch 'user_can_membership' into 'next'
...
refactor(state_accessor): add method to check if a user can invite another user
See merge request famedly/conduit!621
2024-04-06 14:27:20 +00:00
Timo Kösters
e8796d6bf9
Merge branch 'admin-check-remote-users' into 'next'
...
fix: do not allow administration of remote users
Closes #377
See merge request famedly/conduit!614
2024-04-06 13:21:29 +00:00
Matthias Ahouansou
fe78cc8262
refactor(state_accessor): add method to check if a user can invite another user
2024-04-06 14:20:18 +01:00
Timo Kösters
03f9c888f0
Merge branch 'remove-join_authorized_via_users_servers' into 'next'
...
fix(membership): remove join_authorized_via_users_server field on state update
See merge request famedly/conduit!619
2024-04-06 13:20:01 +00:00
Matthias Ahouansou
110b7e10e6
fix: do not allow administration of remote users
2024-04-05 10:56:28 +01:00
Timo Kösters
6c3ce71304
Merge branch 'dont-expect-reqwest-http-request' into 'next'
...
fix: do not expect that all http requests are valid reqwest requests
Closes #396
See merge request famedly/conduit!611
2024-04-05 09:53:14 +00:00
Charles Hall
dc23206e27
Merge branch 'nix-0.28' into 'next'
...
chore: upgrade nix to 0.28
See merge request famedly/conduit!615
2024-04-04 04:34:46 +00:00
Matthias Ahouansou
0f6b771cdd
fix(membership): remove join_authorized_via_users_server field on state update
2024-04-03 22:46:47 +01:00
Timo Kösters
24e9c99d47
Merge branch 'no-auth-ignore-token' into 'next'
...
fix: ignore access tokens where they are not needed
See merge request famedly/conduit!617
2024-04-02 18:18:59 +00:00
Matthias Ahouansou
0d62c9de7c
fix: ignore access tokens where they are not needed
2024-04-02 17:19:59 +01:00
Timo Kösters
33fb32be9a
Merge branch 'srv-matrix-fed-record' into 'next'
...
feat: use _matrix-fed._tcp SRV record, fallback to _matrix._tcp
See merge request famedly/conduit!616
2024-04-01 21:30:58 +00:00
Matthias Ahouansou
e38af9b7fc
feat: use _matrix-fed._tcp SRV record, fallback to _matrix._tcp
2024-04-01 20:55:13 +01:00
Matthias Ahouansou
1c529529aa
chore: upgrade nix to 0.28
...
needed for musl targets on s390x
2024-04-01 13:36:38 +01:00
Timo Kösters
cf1e7bc1ed
Merge branch 'unregister-fail-id-not-found' into 'next'
...
fix: return error when trying to unregister unknown appservice id
See merge request famedly/conduit!610
2024-03-31 21:26:31 +00:00
Matthias Ahouansou
3ce3d13378
fix: do not expect that all http requests are valid reqwest requests
2024-03-31 22:20:36 +01:00
Matthias Ahouansou
11612e347d
fix: return error when trying to unregister unknown appservice id
2024-03-31 21:24:15 +01:00
Timo Kösters
7aa70e2030
Merge branch 'error-appservice-token-auth' into 'next'
...
fix: reject requests with authentication when not used
Closes #430
See merge request famedly/conduit!608
2024-03-31 09:43:17 +00:00
Timo Kösters
71546a9fb7
Merge branch 'registration_appservice_token_check' into 'next'
...
fix: reject /register requests when there is no token and the type is appservice
Closes #430
See merge request famedly/conduit!609
2024-03-31 09:42:21 +00:00
Matthias Ahouansou
5c634ceb6b
fix: reject requests with authentication when not used
2024-03-30 16:50:21 +00:00
Matthias Ahouansou
8d70f69e62
fix: reject /register requests when there is no token and the type is appservice
2024-03-30 12:40:58 +00:00
Timo Kösters
9176474513
Merge branch 'ruma-registration-type' into 'next'
...
fix: don't panic if registration url is empty
See merge request famedly/conduit!583
2024-03-23 15:33:01 +00:00
Matthias Ahouansou
b20483aa13
refactor(appservices): avoid cloning frequently
2024-03-22 20:53:27 +00:00
Matthias Ahouansou
5c650bb67e
refactor: use BTreeMap for cached registration info
2024-03-22 17:52:47 +00:00
Timo Kösters
b11855e7a1
Merge branch 'performance' into 'next'
...
improvement: do not save typing edus in db
See merge request famedly/conduit!597
2024-03-22 08:32:40 +00:00
Timo Kösters
0bb28f60cf
refactor: minor appservice code cleanup
2024-03-22 08:59:36 +01:00
Timo Kösters
d2817679e5
refactor: remove previous typing implementation and add sync wakeup for new one
2024-03-22 08:24:17 +01:00
Timo Kösters
6bd7ff4917
improvement: do not save typing edus in db
2024-03-22 07:48:44 +01:00
Timo Kösters
bdae9ceccf
Merge branch 'rocksdb' into 'next'
...
improvement: use simpler rocksdb config
See merge request famedly/conduit!602
2024-03-22 06:47:51 +00:00
Charles Hall
3ffdaaddcd
Merge branch 'docs' into 'next'
...
reduce scope of the documentation
See merge request famedly/conduit!607
2024-03-21 23:08:36 +00:00
Charles Hall
5a4ee9808a
make chapter name reflect file name
...
Personally I think this makes more sense anyway.
2024-03-21 15:52:54 -07:00
Charles Hall
3dd21456ef
reduce scope of nixos documentation
...
There are so many ways to do this we realistically shouldn't bother
describing any of them, especially because people should be learning all
the options and choosing the one that suits them best anyway.
2024-03-21 15:52:54 -07:00
Charles Hall
f6bfba7014
normalize headers to "Conduit for X"
2024-03-21 15:52:54 -07:00
Charles Hall
f56abba216
rename "simple" deployment to "generic"
...
The main thing this section is really useful for is explaining how to
configure various reverse proxies, which applies to basically anything.
Also, remove all the language about this being "recommended", because
nothing in this documentation is actually tested in CI.
2024-03-21 15:52:54 -07:00
Charles Hall
2022efd279
remove section about cross compilation
...
It is very stale. Please just use Nix. Trying to do it outside of Nix
will be an exercise in frustration, I guarantee it.
2024-03-21 15:40:19 -07:00
Charles Hall
0a790686c5
avoid duplicating links in documentation
...
Because one might forget to update them. I did, initially, which is why
I'm making this change.
2024-03-21 15:40:19 -07:00
Charles Hall
68a33862b3
add mdbook to the devshell
2024-03-21 15:40:19 -07:00
Timo Kösters
879a8b969d
improvement: use simpler rocksdb config
2024-03-21 15:04:40 +01:00
Timo Kösters
81bc1fc4e3
Merge branch 'matrix-ecosystem-clients' into 'next'
...
docs: point people to the matrix client list instead of element
See merge request famedly/conduit!606
2024-03-18 18:14:32 +00:00
Timo Kösters
1931a45aba
Merge branch 'disabled-federation-authcheck' into 'next'
...
refactor: check if federation is disabled inside the authcheck where possible
See merge request famedly/conduit!605
2024-03-18 18:10:21 +00:00
Matthias Ahouansou
5f0bea6961
refactor: check if federation is disabled inside the authcheck where possible
2024-03-18 09:24:37 +00:00
Matthias Ahouansou
120035685b
docs: point people to the matrix client list instead of element
2024-03-17 19:21:29 +00:00
Charles Hall
a8da61e5b7
Merge branch 'docs/mdbook-full' into 'next'
...
docs: build docs using mdBook and copy all markdown files
See merge request famedly/conduit!604
2024-03-17 04:06:58 +00:00
Samuel Meenzen
a3968725b4
chore: add EditorConfig
2024-03-16 20:01:16 -07:00
Charles Hall
6800e5fd18
build book in ci, deploy it to gitlab pages
2024-03-16 20:01:15 -07:00
Charles Hall
4f8d3953b3
add nix output for the book
2024-03-16 20:01:15 -07:00
Samuel Meenzen
425660472c
docs: build docs using mdBook
2024-03-16 20:01:15 -07:00
