dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-12-04 20:08:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
2286 commits 28 branches 14 tags 16 MiB
Commit graph

2286 commits

This branch
This branch
All branches
Author SHA1 Message Date
Timo Kösters 63cbaedb79 Merge branch 'bearerfix' into 'next' 
fix: send correct bearer token to appservices

Closes #358

See merge request famedly/conduit!486
 2023-06-26 07:16:20 +00:00
Timo Kösters db6def8800
fix: send correct bearer token to appservices 2023-06-26 09:15:52 +02:00
Timo Kösters caa841c434 Merge branch 'contextfix' into 'next' 
fix: /context for element android. start and end must be set even with limit=0

See merge request famedly/conduit!485
 2023-06-26 06:34:10 +00:00
Timo Kösters 49a0f3a60d
fix: /context for element android. start and end must be set even with limit=0 2023-06-26 08:33:31 +02:00
Timo Kösters bac82f43af Merge branch 'compressionoff' into 'next' 
Disable compression, see https://en.wikipedia.org/wiki/BREACH

See merge request famedly/conduit!484
 2023-06-25 21:46:34 +00:00
Timo Kösters 15cc801840
Disable compression, see https://en.wikipedia.org/wiki/BREACH 2023-06-25 23:43:54 +02:00
Timo Kösters 5f9ca8e458 Merge branch 'threads' into 'next' 
feat: WIP relationships and threads

See merge request famedly/conduit!483
 2023-06-25 20:59:53 +00:00
Timo Kösters c7e0ea525a
feat: WIP relationships and threads 2023-06-25 19:40:33 +02:00
Charles Hall abd0a014e8
nixpkgs' rocksdb is too old :( 2023-06-17 17:04:57 -07:00
Charles Hall 4a7d3c7301
upgrade rust in Cargo.toml/flake.nix 
Looks like this should've happened as part of !479.
 2023-06-17 17:04:11 -07:00
Charles Hall 15e60818c9
pin nixos-unstable, update flake.lock 
`nixos-unstable` is the rolling release channel of NixOS. The default is
the master branch, which doesn't always have a populated binary cache
and so may result in compiling a bunch of stuff unnecessarily.
 2023-06-17 17:02:10 -07: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.

Sorry, I don't understand how any of this works, and it seems pretty
opaque/difficult to fine-tune.
 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