shruub
/
conduit
mirror of https://gitlab.com/famedly/conduit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,721 Commits
48 Branches
7 Tags
20 MiB
restricted-make-send-join
next
master
make-send-leave
error-parse-image-thumbnail
update-device-seen-on-usage
presence
chore/format-nix
all-the-lints
generate-config
push-federation-invites-to-appservices
unstable-msc4125
jonas-test-ci-docker-building-quemu-on-fsinfo-runner
askstate
recoverbroken
Nyaaori/temp-combined-feature-branch
Nyaaori/destructive-rocksdb-recovery
Nyaaori/full-profile-directory
Nyaaori/read-receipt-config-options
Nyaaori/private-read-receipts
Nyaaori/federation-backfill
Nyaaori/declare-msc3827
Nyaaori/remove-misisng-e2ee-readme
Nyaaori/refactor-next
refactor-ci-fix
bump-docker-alpine-to-3.16.2
jplatte/up-ruma
mdbook-docs-preparation
async
complement-integration
brokenjoinfix
state_full_ids_cache
ticho34782694/conduit-rocksdb-memory-usage
docs-the-second
serve-element-web
perf
nyaaori/older-room-versions
unbeatable-101-next-patch-64009
docs-overhaul
state-res-perf
stablecrosssigning
member-reason
admin-command-for-cache-memory-usage
measure-cache-memory-usage
lesscache
locks
state-res-closure-rebased
ruma-client
v0.2.0
v0.3.0
v0.4.0
v0.5.0
v0.6.0
v0.7.0
v0.8.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '7540227388'
${ noResults }
Commit Graph

1721 Commits (75402273882d4641771d5edde7ed8b498eafcb07)
 

Author SHA1 Message Date
Timo Kösters 7540227388
chore: bump dependencies 2 years ago
Timo Kösters ccdaaceb33 Merge branch 'ci-revamp-2022-10' into 'next' 
Fix CI

See merge request famedly/conduit!414
 2 years ago
Jonas Zohren b37876f3b2 fix(ci): Only build in (remote host) docker and switch to glibc 2 years ago
Timo Kösters e8e0a4dcc5 Merge branch 'Nyaaori/fix-trusted-server-panic' into 'next' 
Cleanly handle invalid response from trusted server instead of panicking

See merge request famedly/conduit!411
 2 years ago
Nyaaori 23cf39c525
Cleanly handle invalid response from trusted server instead of panicking 2 years ago
Nyaaori 00996dd834
Cargo Clippy 2 years ago
Timo Kösters 2a52f666dc Merge branch 'fixtyping' into 'next' 
Fix typing indicators and unencrypted messages in encrypted rooms

See merge request famedly/conduit!409
 2 years ago
Timo Kösters 0cf6545116
fix: not sending enough state on join 2 years ago
Timo Kösters 5d691f405e
fix: stuck typing indicators 2 years ago
Timo Kösters c61914c8e1 Merge branch 'fixhead' into 'next' 
fix: HEAD requests should continue to produce METHOD_NOT_ALLOWED

See merge request famedly/conduit!402
 2 years ago
Timo Kösters 9548c84d32 Merge branch 'fixnotifcount' into 'next' 
fix: element android did not reset notification counts

See merge request famedly/conduit!408
 2 years ago
Timo Kösters 02dd3d32f2
fix: element android did not reset notification counts 2 years ago
Timo Kösters 7c98ba64aa
fix: HEAD requests should produce METHOD_NOT_ALLOWED 2 years ago
Timo Kösters e86fb11512 Merge branch 'nabulator-next-patch-84388' into 'next' 
Update nginx configuration to allow for larger uploads.

See merge request famedly/conduit!407
 2 years ago
Timo Kösters 20e3c42456 Merge branch 'add-nix-flake' into 'next' 
add nix flake

See merge request famedly/conduit!403
 2 years ago
Nabulator 1aff2a54ef comment typo 2 years ago
Nabulator 238ebcfcac Update nginx configuration to allow for larger uploads. 2 years ago
Timo Kösters 876fdf480d Merge branch '3pid_403_next' into 'next' 
Return 403 to 3pid token routes to signal not implemented

See merge request famedly/conduit!375
 2 years ago
James Blachly 3bc0a1924b Return 403 to 3pid token routes to signal not implemented 2 years ago
Timo Kösters 4af998963b Merge branch 'fix-axum-request-size' into 'next' 
fix(main): fix request size limit to max_request_size (axum defaults 2MB)

See merge request famedly/conduit!406
 2 years ago
AndSDev 10d2da3009 fix(main): fix request size limit to max_request_size (axum defaults 2MB) 2 years ago
Charles Hall 716f82db6d
add nix/nixos deployment documentation 2 years ago
Charles Hall fe7d8c4f12
add nix flake 
Also add `.envrc` for direnv + Nix users. This makes developing locally
easier for us NixOS folks.

The flake itself will allow NixOS users to pull code directly from
Conduit's repository, making it completely trivial to stay up-to-date
with every commit.

I'd also like to add a NixOS module directly to this repository at some
point so that new configuration options will be available in the NixOS
module faster. But for now, NixOS users can simply override
`serivces.matrix-conduit.package` and get pretty much all the
functionality.

I've added myself to the `CODEOWNERS` file for the Nix files, since I am
willing to maintain this stuff. I use Conduit on NixOS so I'm personally
invested in having this work.

Lastly, `.gitignore` was updated to exclude symlinks created by `direnv`
and `nix build` and other such Nix commands.

This doesn't come without maintenance burden, however:

* The `sha256` in `flake.nix` will need to be updated whenever Conduit's
  MSRV is updated, but that should be pretty infrequent.

* `nix flake update` should be run every so often to pull in updates to
  `nixpkgs` and other flake inputs. I think downstream users can also
  override this themselves with `inputs.<name>.inputs.<name>.follows`.

* `nix flake check` should be run in CI to ensure Nix builds keep
  working.

* `nixpkgs-fmt --check $(fd '\.nix')` (or similar) should be run in CI
  to ensure style uniformity.
 2 years ago
Timo Kösters cb2b5beea8 Merge branch 'fix_persy' into 'next' 
fix: update persy implementation after refactor

See merge request famedly/conduit!396
 2 years ago
Timo Kösters 2231a69b4c
fix: make previous MR compile 2 years ago
Timo Kösters 13052388a7
Merge branch 'conduit-next' into next 2 years ago
Max Cohen 6fd39ae174
Raise 404 when room doesn't exist 
Raise 404 "Room not found" when changing or accessing room visibility
settings (`GET` and `PUT
/_matrix/client/r0/directory/list/room/{roomId}`).
See issue #290
 2 years ago
Timo Kösters 2627ca5e3d Merge branch 'update-rust' into 'next' 
update rust to avoid a cargo problem

See merge request famedly/conduit!395
 2 years ago
Timo Kösters ed5b8d6a46 Merge branch 'Nyaaori/fix-whoami-appservices' into 'next' 
Fix is_guest value on whoami for appservice users

Closes #310

See merge request famedly/conduit!401
 2 years ago
Nyaaori 2d0fdddd34
Do not return true for is_guest on whoami for appservice users 2 years ago
Timo Kösters 3054af41ba Merge branch 'Nyaaori/bump-default-room-version' into 'next' 
Bump default room version to V9

See merge request famedly/conduit!400
 2 years ago
Nyaaori 1e1a144dfa
Move room version 10 out of experimental/unstable 2 years ago
Nyaaori cc3e1f58cc
Bump default room version to V9; per matrix spec recommendation 2 years ago
Timo Kösters b1991c8f4f Merge branch 'Nyaaori/rejoin-fix' into 'next' 
Rejoin over federation if we are not participating

See merge request famedly/conduit!399
 2 years ago
Timo Kösters 6f7f2820ce Merge branch 'Nyaaori/restricted-join-fix' into 'next' 
Fix doing restricted joins into rooms we are not participating in

See merge request famedly/conduit!398
 2 years ago
Nyaaori e9697f13d6
Handle initiating restricted joins over federation 
Allows Conduit users to join restricted rooms if we are not currently participating
 2 years ago
Nyaaori 3b0aa23fdf
Rejoin room over federation if we are not participating in it; do not include invited users in participating servers calculation 2 years ago
Timo Kösters aca6218c0a Merge branch 'unrecognizedmethods' into 'next' 
fix: send unrecognized error on wrong http methods

See merge request famedly/conduit!397
 2 years ago
Timo Kösters 3a45628e1d
fix: send unrecognized error on wrong http methods 2 years ago
Tglman 842feabced fix: update persy implementation after refactor 2 years ago
Charles Hall 286936db32
msrv is 1.63 in Cargo.toml; use that 2 years ago
Charles Hall bf7c4b4001
update rust to avoid a cargo problem 
We were hitting [this bug][0] when trying to select a version for clap
^4.

[0]: https://github.com/rust-lang/cargo/issues/10623
 2 years ago
Timo Kösters c948324cf2 Merge branch 'fix-admin-help' into 'next' 
fix `@conduit help` not working in the admin room

See merge request famedly/conduit!392
 2 years ago
Timo Kösters ce188daccb
Merge branch 'conduit-lower-default-log-level' into HEAD 2 years ago
exin 98702da4e6
Lower default log level for docker 2 years ago
exin 92f7f0c849
Lower log level commented config options 2 years ago
exin 7451abe3ea
Lower default log level for docker and debian 2 years ago
exin 3e6c66b899
Fix formatting 2 years ago
exin 3a40bf8ae0
Add error for invalid log config 
Log config falls back to "warn"
 2 years ago
exin 9c922db14b
Lower default log level 
Update config-example.toml to accordingly

Closes #281
 2 years ago