Commit Graph

2040 Commits (c86f9a5c5bee16daed9bc5f863d86b84f1026fa4)
 

Author SHA1 Message Date
Jonas Zohren 26b8605fa0 ci: Adjust to current docker 1 year ago
Timo Kösters dbd360ebb9 Merge branch 'unbreak' into 'next'
fix rustc version, nix upkeep

See merge request famedly/conduit!482
1 year ago
Timo Kösters 48e6e0659f Merge branch 'relations' into 'next'
Add relations endpoints, edits and threads work now

See merge request famedly/conduit!487
1 year ago
Timo Kösters 72eb1972c1
Add relations endpoints, edits and threads work now 1 year ago
Timo Kösters 63cbaedb79 Merge branch 'bearerfix' into 'next'
fix: send correct bearer token to appservices

Closes #358

See merge request famedly/conduit!486
1 year ago
Timo Kösters db6def8800
fix: send correct bearer token to appservices 1 year ago
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
1 year ago
Timo Kösters 49a0f3a60d
fix: /context for element android. start and end must be set even with limit=0 1 year ago
Timo Kösters bac82f43af Merge branch 'compressionoff' into 'next'
Disable compression, see https://en.wikipedia.org/wiki/BREACH

See merge request famedly/conduit!484
1 year ago
Timo Kösters 15cc801840
Disable compression, see https://en.wikipedia.org/wiki/BREACH 1 year ago
Timo Kösters 5f9ca8e458 Merge branch 'threads' into 'next'
feat: WIP relationships and threads

See merge request famedly/conduit!483
1 year ago
Timo Kösters c7e0ea525a
feat: WIP relationships and threads 1 year ago
Charles Hall abd0a014e8
nixpkgs' rocksdb is too old :( 1 year ago
Charles Hall 4a7d3c7301
upgrade rust in Cargo.toml/flake.nix
Looks like this should've happened as part of !479.
1 year ago
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.
1 year ago
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
1 year ago
Jonas Zohren a3a9b60abc chore(ci): Adjust to rust version bumps 1 year ago
Timo Kösters 808b12f618 Merge branch 'restricted' into 'next'
fix: restricted room error is now FORBIDDEN

See merge request famedly/conduit!478
1 year ago
Timo Kösters faa9208a3e
cargo fmt 1 year ago
Timo Kösters 1ea27c4f97
fix: restricted room error is now FORBIDDEN 1 year ago
Timo Kösters 422ee40107 Merge branch 'mr-conduit-appservice-login' into 'next'
feat: support end to bridge encryption

See merge request famedly/conduit!454
1 year ago
Timo Kösters 0280fa5793 Merge branch 'next' into 'next'
fix nix readme to work with ipv6

See merge request famedly/conduit!475
1 year ago
digital 664d6baace fix: make requested changes 1 year ago
Jade be9196430d fix nix readme to work with ipv6 1 year ago
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
1 year ago
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
1 year ago
Timo Kösters c38df57279 Merge branch 'deploymd' into 'next'
Minor DEPLOY.md changes

See merge request famedly/conduit!473
1 year ago
Timo Kösters 4e2bbf9d6a
Minor DEPLOY.md changes 1 year ago
Timo Kösters 7a9ec851fc Merge branch 'bump' into 'next'
Bump dependencies

See merge request famedly/conduit!472
1 year ago
Timo Kösters d62cd2ae51
chore: bump dependencies 1 year ago
Timo Kösters 49b5af6d45
chore: bump rocksdb 1 year ago
Timo Kösters 1f1444da8c Merge branch 'pushrules' into 'next'
Improvements to pushrules endpoints

Closes #316

See merge request famedly/conduit!461
1 year ago
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
1 year ago
x4u 921b266d86 X4u/add apache cloudflare deploy info 1 year ago
Timo Kösters dbbd164e39 Merge branch 'admin-command-fix' into 'next'
Recognize admin commands without : after tag

See merge request famedly/conduit!470
1 year ago
Jonathan Flueren f5e3b0e2dd Recognize admin commands without : after tag
Very useful since many Matrix clients don't insert : after user tags
1 year ago
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
1 year ago
Charles Hall eb4323cc0f
use mold on linux 1 year ago
Charles Hall a6712627e4
tiny refactor 1 year ago
Charles Hall 3be32c4dac
factor out shared things 1 year ago
Charles Hall 55149e3336
use crane instead of naersk
I guess naersk still doesn't support git dependencies using workspace
inheritance, but crane does.
1 year ago
Charles Hall 2b63e46fc5
use system rocksdb
This mostly just improves build times.
1 year ago
Charles Hall a0c449e570
update flake.lock 1 year ago
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.
1 year ago
Kévin Commaille 1929ca5d9d
Add a database migration to fix and update the default pushrules 1 year ago
Kévin Commaille 88c6bf7595
Always return an error if a push rule is not found 1 year ago
Kévin Commaille 4635644e21
Use the ruma methods for managing rulesets 1 year ago
Kévin Commaille f53ecaa97d
Bump Ruma 1 year ago
Timo Kösters f704169aeb Merge branch 'fixjoin' into 'next'
fix: let requests continue event if client disconnects

See merge request famedly/conduit!464
1 year ago
Timo Kösters 2a7c4693b8
fix: don't accept new requests when shutting down 1 year ago