Commit Graph

1304 Commits (92571d961f8ec0ce72c0c40433e2487032643060)
 

Author SHA1 Message Date
Jonas Platte 92571d961f
Remove mutation from default_config and set default log_level to off 2 years ago
Timo Kösters 7a388f4d72 Merge branch 'command-refactor' into 'next'
Move and refactor admin commands into admin module

See merge request famedly/conduit!253
2 years ago
Andrei Vasiliu b56efcdc2a Merge remote-tracking branch 'origin/next' into command-refactor
Fixed a small conflict in admin.rs
2 years ago
Andrei Vasiliu 6399a7fe4e Remove dash from admin command help 2 years ago
Timo Kösters 79345dc2a6 Merge branch 'refactor' into 'next'
Some refactorings

See merge request famedly/conduit!279
2 years ago
Jonas Platte 974c10e739
Move Config out of database module 2 years ago
Jonas Platte ce60fc6859
Stop using set_env to configure tracing-subscriber 2 years ago
Jonas Platte abb4b4cf0b
Remove TryFrom, TryInto imports
They are no longer needed in the 2021 edition.
2 years ago
Andrei Vasiliu 4bbff69a24 Merge remote-tracking branch 'origin/next' into command-refactor
Fixed conflict with commit 78502aa6b1
2 years ago
Timo Kösters b4755ba15b Merge branch 'tests' into 'next'
Bug fixes

See merge request famedly/conduit!278
2 years ago
Timo Kösters 9ef3abacd4
fix: initial state deserialize->serialize error 2 years ago
Andrei Vasiliu 87225e70c3 Parse admin command body templates from doc comments 2 years ago
Jonas Zohren 510a44699d Merge branch 'fix-healthcheck-no-port' into 'next'
Docker: Healtcheck and build fixes

Closes #222

See merge request famedly/conduit!277
2 years ago
Jonas Zohren c4733676cf Apply feedback from Ticho 2 years ago
Jonas Zohren e5bac5e4f5
fix: Running in Docker 2 years ago
Jonas Zohren 9478c75f9d
Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers
Also run all builds on approved MRs
2 years ago
Torsten Flammiger e24d75cffc
Return the ID of the appservice that was created by register_appservice 2 years ago
Torsten Flammiger 8f69f02e59
add error handling for register_appservice too 2 years ago
Torsten Flammiger da7b55b39c
Cleanup appservice events after removing the appservice 2 years ago
user bfcf2db497
fix: mention dependencies to build from source 2 years ago
Timo Kösters a5f004d7e9
fix: signature mismatch on odd send_join servers 2 years ago
Jonas Zohren 004dfdeaac Merge branch 'ci-test-using-prebuilt-images' into 'next'
Use custom container images for CI

Closes #221

See merge request famedly/conduit!273
2 years ago
Jonas Zohren fa4099b138 Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers
Also run all builds on approved MRs
2 years ago
Timo Kösters caf9834e50
feat: cache capacity modifier 2 years ago
Timo Kösters 23aecb78c7
fix: use to_lowercase on /register/available username 2 years ago
Timo Kösters e17bbdd42d
tests 2 years ago
Timo Kösters 95ca43e20f Merge branch 'cleanup_events_after_unregister_appservice' into 'next'
Cleanup events after unregister appservice / update appservice error handling / return ID of new appservice

See merge request famedly/conduit!276
2 years ago
Torsten Flammiger 28d3b348d2 Return the ID of the appservice that was created by register_appservice 2 years ago
Torsten Flammiger 78502aa6b1 add error handling for register_appservice too 2 years ago
Torsten Flammiger cc13112592 Cleanup appservice events after removing the appservice 2 years ago
Andrei Vasiliu 677f044d13 Refactor admin code to always defer command processing 2 years ago
Timo Kösters fb2a7ebf66 Merge branch 'build-dependencies-deploy' into 'next'
Mention dependencies to build from source

See merge request famedly/conduit!275
2 years ago
user 8ff95a5a48 fix: mention dependencies to build from source 2 years ago
Jonas Zohren 401b88d16d
fix: Healtcheck use netstat for port as fallback 2 years ago
Jonas Zohren 8c1cf733b5 Merge branch 'fix-healthcheck-no-port' into 'next'
fix: Use default port for healthcheck as fallback

Closes #222

See merge request famedly/conduit!274
2 years ago
Jonas Zohren 44f7a85077
fix: Use default port for healthcheck as fallback
Conduit can start without a specific port being configured.
This adjusts the healthcheck script to tolerate that state.

Closes https://gitlab.com/famedly/conduit/-/issues/222
2 years ago
Jonas Platte 296c68c0cd Merge branch 'get-thumbnail-mxc-as-ref' into 'next'
Do not copy mxc string unnecessarily in db.get_thumbnail()

See merge request famedly/conduit!272
2 years ago
Andrej Kacian 529e88c7f9 Do not copy mxc string unnecessarily in db.get_thumbnail() 2 years ago
Timo Kösters 20006c91af Merge branch 'media-download-followup' into 'next'
Media download followup

See merge request famedly/conduit!271
2 years ago
Andrej Kacian 0f6d232cb1 Style fixes from 'cargo fmt' 2 years ago
Andrej Kacian ccfc243c2c Make get_remote_content() return Result instead of ConduitResult 2 years ago
Timo Kösters f7148def90 Merge branch 'up-ruma' into 'next'
Upgrade Ruma

See merge request famedly/conduit!268
2 years ago
Timo Kösters 63309e52f8 Merge branch 'media-download-with-filename' into 'next'
Media download with filename

See merge request famedly/conduit!266
2 years ago
Andrej Kacian c4317a7a96 Reduce code duplication in media download route handlers 2 years ago
Jonas Platte 9c2000cb89
Upgrade Ruma 2 years ago
Andrej Kacian 52873c88b7 Fix incorrect HTTP method in doc comments of two media routes 2 years ago
Andrej Kacian 8472eff277 Implement media download with custom filename 2 years ago
Jonas Zohren ba8d5abb67 Merge branch 'fix/sccache' into 'next'
Fix CI cargo-cross caching with sccache

See merge request famedly/conduit!264
2 years ago
Maxim De Clercq ff16729976
fix: correct RUSTC_WRAPPER path in cross container 2 years ago
Maxim De Clercq acf1585fc3
fix: make sure that libatomic is linked statically 2 years ago