Commit Graph

1760 Commits (c86313d4fa5b4d074e5ef40442a8a272d915dd3a)
 

Author SHA1 Message Date
Nyaaori c86313d4fa
chore: code cleanup
https://rust-lang.github.io/rust-clippy/master/index.html#op_ref

https://rust-lang.github.io/rust-clippy/master/index.html#str_to_string

https://rust-lang.github.io/rust-clippy/master/index.html#needless_lifetimes
2 years ago
Timo Kösters 7b98741163 Merge branch 'restrictedjoinlocally' into 'next'
improvement: handle restricted joins locally

See merge request famedly/conduit!439
2 years ago
Timo Kösters 2a04c213f9
improvement: handle restricted joins locally 2 years ago
Timo Kösters d7eaa9c5cc Merge branch 'logging-cleanup' into 'next'
Replace println/dbg calls with corresponding macros from tracing crate

See merge request famedly/conduit!424
2 years ago
Timo Kösters 2a0515f528
Replace println/dbg calls with corresponding macros from tracing crate 2 years ago
Timo Kösters 3930fd08d7 Merge branch 'docs' into 'next'
Update README

See merge request famedly/conduit!438
2 years ago
Timo Kösters 683eefbd0b
Update README 2 years ago
Timo Kösters d963ad8cc1 Merge branch 'jaegerfix' into 'next'
fix: jaeger support

See merge request famedly/conduit!437
2 years ago
Timo Kösters 6d5e54a66b
fix: jaeger support 2 years ago
Timo Kösters 2b2bfb91c2 Merge branch 'up-ruma' into 'next'
Upgrade Ruma

See merge request famedly/conduit!435
2 years ago
Timo Kösters f1d2574651
finish upgrade ruma 2 years ago
Jonas Platte d39ce1401d
WIP: Upgrade Ruma 2 years ago
Jonas Platte 7fd5b22e3b
The procMacro option has long been on by default
… and it's good to let people have their own local configs that won't be
tracked by git.
2 years ago
Timo Kösters db7a7085f4 Merge branch 'fix/pushrules_database' into 'next'
Migrate database to use correct rule id in pushrules.

See merge request famedly/conduit!405
2 years ago
Timo Kösters 5894d35eb2 Merge branch 'fixrestrictedjoin' into 'next'
fix: rejoining restricted rooms over federation

See merge request famedly/conduit!431
2 years ago
Timo Kösters b9fd6127e2
fix: rejoining restricted rooms over federation 2 years ago
Jonas Zohren bb9bc0a001 Merge branch 'dockerdoc-nginx-content-type' into 'next'
Describe a better way to enforce Content-Type in nginx

See merge request famedly/conduit!415
2 years ago
Timo Kösters f4dd051a1d Merge branch 'sd-notify' into 'next'
call sd-notify after init and before exit

See merge request famedly/conduit!426
2 years ago
Vladan Popovic 06d3efc4d0 feat(systemd): call sd-notify after init and before exit 2 years ago
Vladan Popovic 66ad114e19 feat: add systemd feature flag 2 years ago
Jonas Zohren 4b737b46ac Merge branch 'cross-compiling' into 'next'
Added cross-compilation instructions

See merge request famedly/conduit!430
2 years ago
Orhideous bcd522e75f Added cross-compilation instructions to DEPLOY.md 2 years ago
Jonas Zohren 249960b111 Merge branch 'fix-lock' into 'next'
Update Cargo.lock

See merge request famedly/conduit!427
2 years ago
Andriy Kushnir (Orhideous) 583aea187b
Update Cargo.lock 2 years ago
Timo Kösters 396dac6d82 Merge branch 'fixroomleave' into 'next'
fix: unable to leave room

See merge request famedly/conduit!419
2 years ago
Timo Kösters 9149be31af Merge branch 'logs-cleanup' into 'next'
Clean some noisy logs

See merge request famedly/conduit!423
2 years ago
Timo Kösters 32a4ded4a1 Merge branch 'Nyaaori/reduce-generated-token-length' into 'next'
Reduce length of generated access tokens and session ids

See merge request famedly/conduit!386
2 years ago
Timo Kösters e3dabdf525 Merge branch 'Nyaaori/cleanup' into 'next'
misc. cleanup

See merge request famedly/conduit!420
2 years ago
Nyaaori b59304a4df
Reduce length of generated access tokens and session ids
Reduces generated tokens and session ids down to 32 characters (~190 bits of entropy) in length
2 years ago
Nyaaori 66bc41125c
refactor: cleanup 2 years ago
Nyaaori 6786c44f4d
chore: Fix MSRV
Ruma requires Rust 1.64
2 years ago
Andriy Kushnir (Orhideous) a3a1db124d
Clean some noisy logs 2 years ago
Timo Kösters 3b3c451c83
fix: unable to leave room 2 years ago
Timo Kösters cf99316082 Merge branch 'dendritefix' into 'next'
Dendrite invite fix

See merge request famedly/conduit!416
2 years ago
Timo Kösters c063700255
fix: invite dendrite users 2 years ago
Timo Kösters 7540227388
chore: bump dependencies 2 years ago
Ticho 34782694 09015f113c Describe a better way to enforce Content-Type in nginx
add_header will not override the Content-Type header set by the server,
but will instead add another header below, which is obviously not ideal.

The proposed change will instead tell nginx to set the correct value for
this header straight away.
2 years ago
Paul Beziau a2d8aec1e3 Moving the unwraping of a variable
Moving the unwraping of the variable "rule" inside the condition instead of the if body, for the migration of the database from version 11 to 12.
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