Commit Graph

1791 Commits (c6e3438e7639abeb23f6a3adf296a60efbf5bc57)
 

Author SHA1 Message Date
Timo Kösters c6e3438e76 Merge branch 'trusted-servers-doc' into 'next'
document `trusted_servers` option

See merge request famedly/conduit!451
1 year ago
Charles Hall 844508bc48
document `trusted_servers` option 1 year ago
Timo Kösters b3aec63d67 Merge branch 'partial-nix-fix' into 'next'
partial nix fix

See merge request famedly/conduit!446
1 year ago
Timo Kösters 2da4ae6b3b Merge branch 'code-of-conduct' into 'next'
Add Contributor's Covenant Code of Conduct

See merge request famedly/conduit!448
1 year ago
Timo Kösters 5e6b498c22 Merge branch 'fix-nix-docs' into 'next'
fix nix docs

See merge request famedly/conduit!449
1 year ago
Charles Hall 391beddaf4
fix nix docs
I made some silly copy paste errors while writing this...
1 year ago
r3g_5z 112b76b1c1
Add Contributor's Covenant Code of Conduct
Signed-off-by: r3g_5z <june@girlboss.ceo>
1 year ago
Charles Hall 315944968b
remind people to update the hash
And offer help since it's pretty easy but impossible if you don't have
Nix installed.
2 years ago
Charles Hall 9f74555c88
update flake.lock 2 years ago
Charles Hall 0a4e8e5909
update rust toolchain hash 2 years ago
Timo Kösters 19156c7bbf
Update Cargo.lock 2 years ago
Timo Kösters 2a66ad4329
Bump version to 0.6.0-alpha 2 years ago
Timo Kösters 53f14a2c4c
Merge remote-tracking branch 'origin/next' 2 years ago
Timo Kösters d20f21ae32 Merge branch 'nextversion' into 'next'
Preparing for v0.5.0 release

See merge request famedly/conduit!443
2 years ago
Timo Kösters f7db3490f6
Bump version to v0.5.0 2 years ago
Timo Kösters c7a7c913d4
Bump ruma 2 years ago
Timo Kösters 76a82339a2
tweak default rocksdb settings 2 years ago
Timo Kösters 94df9cdbba Merge branch 'Nyaaori/prev_events-config-option' into 'next'
Make prev_events fetch limit configurable

See merge request famedly/conduit!422
2 years ago
Timo Kösters b231d7f15c Merge branch 'Nyaaori/membership-events-reason' into 'next'
Implement membership ban/join/leave/invite reason

See merge request famedly/conduit!442
2 years ago
Nyaaori 7cc346bc18
feat: Implement membership ban/join/leave/invite reason support 2 years ago
Timo Kösters 48bc0db723 Merge branch 'Nyaaori/code-cleanup' into 'next'
Code Cleanup

See merge request famedly/conduit!441
2 years ago
Nyaaori 7c196f4e00
feat: Add max prev events config option, allowing adjusting limit for prev_events fetching 2 years ago
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