Timo Kösters
c7e0ea525a
feat: WIP relationships and threads
2023-06-25 19:40:33 +02:00
Timo Kösters
def079267d
Merge branch 'adjust-to-rust-version-bumps' into 'next'
...
chore(ci): Adjust to rust version bumps
See merge request famedly/conduit!479
2023-06-10 15:35:22 +00:00
Jonas Zohren
a3a9b60abc
chore(ci): Adjust to rust version bumps
2023-06-10 15:35:22 +00:00
Timo Kösters
808b12f618
Merge branch 'restricted' into 'next'
...
fix: restricted room error is now FORBIDDEN
See merge request famedly/conduit!478
2023-06-08 18:52:03 +00:00
Timo Kösters
faa9208a3e
cargo fmt
2023-06-08 20:51:34 +02:00
Timo Kösters
1ea27c4f97
fix: restricted room error is now FORBIDDEN
2023-06-08 20:49:42 +02:00
Timo Kösters
422ee40107
Merge branch 'mr-conduit-appservice-login' into 'next'
...
feat: support end to bridge encryption
See merge request famedly/conduit!454
2023-05-26 12:48:23 +00:00
Timo Kösters
0280fa5793
Merge branch 'next' into 'next'
...
fix nix readme to work with ipv6
See merge request famedly/conduit!475
2023-05-26 12:30:02 +00:00
digital
664d6baace
fix: make requested changes
2023-05-26 13:06:28 +02:00
Jade
be9196430d
fix nix readme to work with ipv6
2023-05-25 18:21:01 +00:00
Jonas Zohren
533bccad8f
Merge branch '350-debian-package-from-docker-packager-result-doesn-t-seem-to-install-configuration-files' into 'next'
...
Fix CI + Debian packaging
Closes #350
See merge request famedly/conduit!474
2023-05-21 20:41:08 +00:00
Jonas Zohren
a4261aac76
* Fix Debian builds by actually including the whole debian directory into deb creation
...
* Fix CI by explicitly setting hostname of docker in docker service
* Fix Docker build by bumping the Rust version to 1.69
* Fix cargo check in CI by bumping the Rust version to 1.69
2023-05-21 20:41:08 +00:00
Timo Kösters
c38df57279
Merge branch 'deploymd' into 'next'
...
Minor DEPLOY.md changes
See merge request famedly/conduit!473
2023-05-21 13:17:29 +00:00
Timo Kösters
4e2bbf9d6a
Minor DEPLOY.md changes
2023-05-21 15:16:23 +02:00
Timo Kösters
7a9ec851fc
Merge branch 'bump' into 'next'
...
Bump dependencies
See merge request famedly/conduit!472
2023-05-21 11:45:20 +00:00
Timo Kösters
d62cd2ae51
chore: bump dependencies
2023-05-21 13:42:59 +02:00
Timo Kösters
49b5af6d45
chore: bump rocksdb
2023-05-21 13:41:51 +02:00
Timo Kösters
1f1444da8c
Merge branch 'pushrules' into 'next'
...
Improvements to pushrules endpoints
Closes #316
See merge request famedly/conduit!461
2023-05-21 10:41:31 +00:00
Timo Kösters
2a9a908343
Merge branch 'x4u/add-apache-cloudflare-deploy-info' into 'next'
...
X4u/add apache cloudflare deploy info
See merge request famedly/conduit!471
2023-05-21 07:04:59 +00:00
x4u
921b266d86
X4u/add apache cloudflare deploy info
2023-05-21 07:04:58 +00:00
Timo Kösters
dbbd164e39
Merge branch 'admin-command-fix' into 'next'
...
Recognize admin commands without : after tag
See merge request famedly/conduit!470
2023-05-17 19:09:54 +00:00
Jonathan Flueren
f5e3b0e2dd
Recognize admin commands without : after tag
...
Very useful since many Matrix clients don't insert : after user tags
2023-05-15 19:25:57 +00:00
Timo Kösters
1b9e63f426
Merge branch 'unbreak-nix' into 'next'
...
Fix Nix builds (actually) (for real) (it seriously builds this time)
See merge request famedly/conduit!466
2023-04-05 09:59:09 +00:00
Charles Hall
eb4323cc0f
use mold on linux
2023-04-04 19:16:07 -07:00
Charles Hall
a6712627e4
tiny refactor
2023-04-04 19:15:09 -07:00
Charles Hall
3be32c4dac
factor out shared things
2023-04-04 17:52:15 -07:00
Charles Hall
55149e3336
use crane instead of naersk
...
I guess naersk still doesn't support git dependencies using workspace
inheritance, but crane does.
2023-04-04 17:42:24 -07:00
Charles Hall
2b63e46fc5
use system rocksdb
...
This mostly just improves build times.
2023-04-04 17:42:13 -07:00
Charles Hall
a0c449e570
update flake.lock
2023-04-04 17:09:49 -07:00
Charles Hall
c997311bea
Revert "build(nix): fix flake builds"
...
This reverts commit 5d913f7010
2023-04-04 17:02:34 -07:00
Kévin Commaille
1929ca5d9d
Add a database migration to fix and update the default pushrules
2023-03-18 15:03:57 +01:00
Kévin Commaille
88c6bf7595
Always return an error if a push rule is not found
2023-03-18 15:03:57 +01:00
Kévin Commaille
4635644e21
Use the ruma methods for managing rulesets
2023-03-18 15:03:57 +01:00
Kévin Commaille
f53ecaa97d
Bump Ruma
2023-03-18 15:03:56 +01:00
Timo Kösters
f704169aeb
Merge branch 'fixjoin' into 'next'
...
fix: let requests continue event if client disconnects
See merge request famedly/conduit!464
2023-03-18 07:59:36 +00:00
Timo Kösters
2a7c4693b8
fix: don't accept new requests when shutting down
2023-03-18 08:58:20 +01:00
Timo Kösters
da3871f39a
fix: let requests continue event if client disconnects
2023-03-17 22:45:13 +01:00
Timo Kösters
664ee7d89a
Merge branch 'backfill' into 'next'
...
feat: handle backfill requests
See merge request famedly/conduit!459
2023-03-16 13:32:42 +00:00
Timo Kösters
42b12934e3
Don't crash when a room errors
2023-03-13 10:43:09 +01:00
Timo Kösters
63f787f635
Reduce logs from info to debug
2023-03-13 10:39:19 +01:00
Timo Kösters
a1bd348977
fix: history visibility
2023-03-13 10:39:19 +01:00
Timo Kösters
27f29ba699
fix: SRV lookups should end with a period
2023-03-13 10:39:19 +01:00
Timo Kösters
cb0ce5b08f
Logs for server resolution
2023-03-13 10:39:18 +01:00
Timo Kösters
b7c99788e4
All the logs
2023-03-13 10:39:18 +01:00
Timo Kösters
2316d89048
Even more logging
2023-03-13 10:39:18 +01:00
Timo Kösters
bde4880c1d
fix: don't unwrap server keys
2023-03-13 10:39:18 +01:00
Timo Kösters
8b648d0d3f
fix: force abort federation requests after 2 minutes
2023-03-13 10:39:18 +01:00
Timo Kösters
4617ee2b6b
More logging for remote joins
2023-03-13 10:39:18 +01:00
Timo Kösters
10fa686c77
feat: respect history visibility
2023-03-13 10:39:18 +01:00
Timo Kösters
2a16a5e967
fix: don't send nulls as unsigned content
2023-03-13 10:39:17 +01:00
