dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-11-26 07:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
1437 commits 23 branches 14 tags 15 MiB
Commit graph

1437 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonas Platte d1d2217019
Clean up error handling for server_server::get_server_keys_route 2022-02-12 12:56:07 +01:00
Jonas Platte 1f7b3fa4ac
Port from Rocket to axum 2022-02-12 12:56:07 +01:00
Timo Kösters 8709c3ae7b Merge branch 'refactor2' into 'next' 
Remove unnecessary uses of event enums

See merge request famedly/conduit!300
 2022-02-12 11:50:23 +00:00
Jonas Platte 5db4c001d1
Remove another unnecessary use of an event enum 2022-02-12 01:58:47 +01:00
Jonas Platte 583ec51f9f
Remove unnecessary use of event enum 2022-02-12 01:58:47 +01:00
M0dEx f602d32aaa
feat: add the actual server name to the welcome message 2022-02-11 18:51:28 +01:00
M0dEx a6976e6d2d
feat: add 'available' to the help command line in the welcome message 2022-02-11 18:40:51 +01:00
M0dEx f2b8aa28f3
feat: add a line with the help command to the welcome message 2022-02-11 18:26:56 +01:00
Andrej Kacian bfbefb0cd2 Display actual error message from TokioAsyncResolver, if any 2022-02-07 12:56:44 +01:00
Andrei Vasiliu 31918bb990 Fix admin room processing commands from its own messages 2022-02-05 08:57:15 +02:00
Torsten Flammiger f110b5710a Move appservice howto into whats-next; again, rename placeholder TURN url 2022-02-04 21:11:50 +01:00
Torsten Flammiger 1cc0b55650 Resolve merge conflict 2022-02-04 19:28:57 +01:00
Torsten Flammiger 63a2c6cce5 Add new TURN Readme and reference it from DEPLOY.md 2022-02-04 19:11:29 +01:00
Jonas Zohren 0cec421930 Merge branch 'ci-hotfix-sytest-on-master' into 'next' 
fix(ci): Always build debug version for sytest

See merge request famedly/conduit!289
 2022-02-04 17:51:57 +00:00
Jonas Zohren 826b077e21
fix(ci): Always build debug version for sytest 2022-02-04 18:43:13 +01:00
Jonas Zohren 4dcc080ad9 Merge branch 'pre-release-doc-changes' into 'next' 
Pre-0.3 doc adjustments

See merge request famedly/conduit!287
 2022-02-04 17:12:33 +00:00
Timo Kösters d55992dc83 Merge branch 'jemallocfeature' into 'next' 
feat: allow disabling jemalloc via feature

See merge request famedly/conduit!285
 2022-02-04 17:08:03 +00:00
Jonas Zohren 103dc7e09b
Pre-0.3 doc adjustments 2022-02-04 18:05:24 +01:00
Timo Kösters dffa5570e7 Merge branch 'emptysearchcrash' into 'next' 
fix: crash on empty search

Closes #190

See merge request famedly/conduit!286
 2022-02-04 16:42:56 +00:00
Timo Kösters dd03608f17
use our own reqwest fork 2022-02-04 17:24:45 +01:00
Timo Kösters eb0b2c429f
fix: crash on empty search 2022-02-04 17:15:52 +01:00
Timo Kösters 8d8edddb2e
feat: allow disabling jemalloc via feature 2022-02-04 17:00:46 +01:00
Timo Kösters f35ad27627 Merge branch 'contextfix' into 'next' 
fix: lazy loading for /context

See merge request famedly/conduit!284
 2022-02-04 13:45:57 +00:00
Timo Kösters 72cd52e57c
fix: lazy loading for /context 2022-02-04 13:33:04 +01:00
Timo Kösters 8db7d2c025 Merge branch 'asonix/encourage-reqwest-reuse' into 'next' 
Re-use a basic reqwest client in all possible cases

See merge request famedly/conduit!265
 2022-02-04 11:27:41 +00:00
Timo Kösters 51cca1a60f Merge branch 'create-admin-room' into 'next' 
Create admin room and hide migration messages on first run

Closes #157 and #225

See merge request famedly/conduit!282
 2022-02-03 21:09:21 +00:00
Andrei Vasiliu e1c0dcb6bb Create admin room and hide migration messages on first run 2022-02-03 22:50:11 +02:00
Timo Kösters 86a9ec9f44 Merge branch 'up-ruma' into 'next' 
Upgrade Ruma

See merge request famedly/conduit!281
 2022-02-03 19:41:47 +00:00
Jonas Platte d23d6fbb37
Upgrade Ruma 2022-02-03 20:24:02 +01:00
Timo Kösters 2d9c5791a6 Merge branch 'rocket-config' into 'next' 
Remove mutation from default_config and set default log_level to off

See merge request famedly/conduit!280
 2022-02-03 19:20:49 +00:00
Jonas Platte 92571d961f
Remove mutation from default_config and set default log_level to off 2022-02-03 19:55:54 +01:00
Timo Kösters 7a388f4d72 Merge branch 'command-refactor' into 'next' 
Move and refactor admin commands into admin module

See merge request famedly/conduit!253
 2022-02-03 18:43:54 +00:00
Andrei Vasiliu b56efcdc2a Merge remote-tracking branch 'origin/next' into command-refactor 
Fixed a small conflict in admin.rs
 2022-02-03 20:31:06 +02:00
Andrei Vasiliu 6399a7fe4e Remove dash from admin command help 2022-02-03 20:21:04 +02:00
Timo Kösters 79345dc2a6 Merge branch 'refactor' into 'next' 
Some refactorings

See merge request famedly/conduit!279
 2022-02-03 12:50:55 +00:00
Jonas Platte 974c10e739
Move Config out of database module 2022-02-03 13:30:04 +01:00
Jonas Platte ce60fc6859
Stop using set_env to configure tracing-subscriber 2022-02-03 13:24:28 +01:00
Jonas Platte abb4b4cf0b
Remove TryFrom, TryInto imports 
They are no longer needed in the 2021 edition.
 2022-02-03 13:24:04 +01:00
Andrei Vasiliu 4bbff69a24 Merge remote-tracking branch 'origin/next' into command-refactor 
Fixed conflict with commit 78502aa6b1
 2022-02-03 13:12:55 +02:00
Timo Kösters b4755ba15b Merge branch 'tests' into 'next' 
Bug fixes

See merge request famedly/conduit!278
 2022-02-03 10:12:04 +00:00
Timo Kösters 9ef3abacd4
fix: initial state deserialize->serialize error 2022-02-03 10:57:54 +01:00
Andrei Vasiliu 87225e70c3 Parse admin command body templates from doc comments 2022-02-02 21:35:57 +02:00
Jonas Zohren 510a44699d Merge branch 'fix-healthcheck-no-port' into 'next' 
Docker: Healtcheck and build fixes

Closes #222

See merge request famedly/conduit!277
 2022-02-02 14:07:49 +00:00
Jonas Zohren c4733676cf Apply feedback from Ticho 2022-02-02 13:35:15 +00:00
Jonas Zohren e5bac5e4f5
fix: Running in Docker 2022-02-02 14:07:35 +01:00
Jonas Zohren 9478c75f9d
Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers 
Also run all builds on approved MRs
 2022-02-02 13:31:28 +01:00
Torsten Flammiger e24d75cffc
Return the ID of the appservice that was created by register_appservice 2022-02-02 13:29:10 +01:00
Torsten Flammiger 8f69f02e59
add error handling for register_appservice too 2022-02-02 13:29:09 +01:00
Torsten Flammiger da7b55b39c
Cleanup appservice events after removing the appservice 2022-02-02 13:29:09 +01:00
user bfcf2db497
fix: mention dependencies to build from source 2022-02-02 13:29:09 +01:00