Timo Kösters
|
fc0aff20cf
|
fix: allow reactivation of users using reset-password admin command
|
2023-02-11 12:43:41 +01:00 |
|
Timo Kösters
|
4223288cdf
|
Merge branch 'fixbadservernameusers' into 'next'
fix: ignore bad user ids in migration
See merge request famedly/conduit!457
|
2023-02-07 16:19:59 +00:00 |
|
Timo Kösters
|
a4f18f99ad
|
fix: ignore bad user ids
|
2023-02-07 16:29:41 +01:00 |
|
Jonas Zohren
|
06df04f61c
|
Merge branch 'fix_docker_healthcheck_for_address' into 'next'
Add a dynamic address resolution to the Docker healthcheck
See merge request famedly/conduit!434
|
2023-01-27 22:43:04 +00:00 |
|
Moritz Heiber
|
cfcc9086ff
|
Add a dynamic address resolution to the Docker healthcheck
|
2023-01-27 22:43:04 +00:00 |
|
Yusuf Bera Ertan
|
11b9cfad5e
|
docs: update nix comment for rust-version in Cargo.toml
|
2023-01-28 00:14:58 +03:00 |
|
Yusuf Bera Ertan
|
5d913f7010
|
build(nix): fix flake builds
|
2023-01-28 00:10:21 +03:00 |
|
Jonas Zohren
|
d68dad580b
|
Merge branch 'complement-improvements' into 'next'
Complement improvements
See merge request famedly/conduit!404
|
2023-01-27 16:41:34 +00:00 |
|
Jonathan de Jong
|
e13dc7c14a
|
add little readme
|
2023-01-26 18:28:33 +01:00 |
|
Jonathan de Jong
|
b158896396
|
Merge remote-tracking branch 'origin/next' into complement-improvements
|
2023-01-26 18:19:39 +01:00 |
|
Timo Kösters
|
f95dd4521c
|
Merge branch 'validate-state-of-admins-room' into 'next'
Validate PDU in admins room
See merge request famedly/conduit!382
|
2023-01-24 13:46:49 +00:00 |
|
Timo Kösters
|
1e77373332
|
Merge branch 'braid/ci-magic' into 'next'
fix: adjust CI config to runner requirements
See merge request famedly/conduit!455
|
2023-01-19 07:46:36 +00:00 |
|
The one with the braid
|
f01b96588d
|
fix: adjust CI config to runner requirements
- make use of more stable BTRFS driver
- set default pull policy to `if-not-present`
Signed-off-by: The one with the braid <the-one@with-the-braid.cf>
|
2023-01-19 07:42:23 +01:00 |
|
digital
|
4d589d9788
|
feat: support end to bridge encryption
by implementing appservice logins
|
2023-01-18 23:34:18 +01:00 |
|
Timo Kösters
|
815db0d962
|
Merge branch 'joinfix' into 'next'
Maybe fix room joins
See merge request famedly/conduit!453
|
2023-01-14 20:22:55 +00:00 |
|
Timo Kösters
|
809c9b4481
|
Maybe fix room joins
This is a workaround for https://github.com/hyperium/hyper/issues/2312
|
2023-01-14 21:20:16 +01:00 |
|
Timo Kösters
|
c6e3438e76
|
Merge branch 'trusted-servers-doc' into 'next'
document `trusted_servers` option
See merge request famedly/conduit!451
|
2023-01-09 16:35:54 +00:00 |
|
Charles Hall
|
844508bc48
|
document trusted_servers option
|
2023-01-09 08:14:13 -08:00 |
|
Timo Kösters
|
b3aec63d67
|
Merge branch 'partial-nix-fix' into 'next'
partial nix fix
See merge request famedly/conduit!446
|
2023-01-09 15:58:40 +00:00 |
|
Timo Kösters
|
2da4ae6b3b
|
Merge branch 'code-of-conduct' into 'next'
Add Contributor's Covenant Code of Conduct
See merge request famedly/conduit!448
|
2023-01-09 15:37:19 +00:00 |
|
Timo Kösters
|
5e6b498c22
|
Merge branch 'fix-nix-docs' into 'next'
fix nix docs
See merge request famedly/conduit!449
|
2023-01-09 15:35:39 +00:00 |
|
Charles Hall
|
391beddaf4
|
fix nix docs
I made some silly copy paste errors while writing this...
|
2023-01-08 12:44:59 -08:00 |
|
r3g_5z
|
112b76b1c1
|
Add Contributor's Covenant Code of Conduct
Signed-off-by: r3g_5z <june@girlboss.ceo>
|
2023-01-08 02:44:25 -05:00 |
|
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.
|
2022-12-23 00:30:36 -08:00 |
|
Charles Hall
|
9f74555c88
|
update flake.lock
|
2022-12-23 00:29:43 -08:00 |
|
Charles Hall
|
0a4e8e5909
|
update rust toolchain hash
|
2022-12-23 00:29:43 -08:00 |
|
Timo Kösters
|
19156c7bbf
|
Update Cargo.lock
|
2022-12-21 16:16:07 +01:00 |
|
Timo Kösters
|
2a66ad4329
|
Bump version to 0.6.0-alpha
|
2022-12-21 16:08:05 +01:00 |
|
Timo Kösters
|
53f14a2c4c
|
Merge remote-tracking branch 'origin/next'
|
2022-12-21 15:51:47 +01:00 |
|
Timo Kösters
|
d20f21ae32
|
Merge branch 'nextversion' into 'next'
Preparing for v0.5.0 release
See merge request famedly/conduit!443
|
2022-12-21 13:12:18 +00:00 |
|
Timo Kösters
|
f7db3490f6
|
Bump version to v0.5.0
|
2022-12-21 14:08:09 +01:00 |
|
Timo Kösters
|
c7a7c913d4
|
Bump ruma
|
2022-12-21 14:08:08 +01:00 |
|
Timo Kösters
|
76a82339a2
|
tweak default rocksdb settings
|
2022-12-21 13:44:23 +01:00 |
|
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
|
2022-12-21 11:06:42 +00:00 |
|
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
|
2022-12-21 10:58:05 +00:00 |
|
Nyaaori
|
7cc346bc18
|
feat: Implement membership ban/join/leave/invite reason support
|
2022-12-21 11:45:12 +01:00 |
|
Timo Kösters
|
48bc0db723
|
Merge branch 'Nyaaori/code-cleanup' into 'next'
Code Cleanup
See merge request famedly/conduit!441
|
2022-12-21 10:00:40 +00:00 |
|
Nyaaori
|
7c196f4e00
|
feat: Add max prev events config option, allowing adjusting limit for prev_events fetching
|
2022-12-21 10:55:32 +01:00 |
|
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
|
2022-12-21 10:42:12 +01:00 |
|
Timo Kösters
|
7b98741163
|
Merge branch 'restrictedjoinlocally' into 'next'
improvement: handle restricted joins locally
See merge request famedly/conduit!439
|
2022-12-18 08:51:31 +00:00 |
|
Timo Kösters
|
2a04c213f9
|
improvement: handle restricted joins locally
|
2022-12-18 09:44:46 +01:00 |
|
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
|
2022-12-18 06:57:23 +00:00 |
|
Timo Kösters
|
2a0515f528
|
Replace println/dbg calls with corresponding macros from tracing crate
|
2022-12-18 07:52:22 +01:00 |
|
Timo Kösters
|
3930fd08d7
|
Merge branch 'docs' into 'next'
Update README
See merge request famedly/conduit!438
|
2022-12-18 06:06:26 +00:00 |
|
Timo Kösters
|
683eefbd0b
|
Update README
|
2022-12-18 07:02:07 +01:00 |
|
Timo Kösters
|
d963ad8cc1
|
Merge branch 'jaegerfix' into 'next'
fix: jaeger support
See merge request famedly/conduit!437
|
2022-12-18 05:52:49 +00:00 |
|
Timo Kösters
|
6d5e54a66b
|
fix: jaeger support
|
2022-12-18 06:37:03 +01:00 |
|
Timo Kösters
|
2b2bfb91c2
|
Merge branch 'up-ruma' into 'next'
Upgrade Ruma
See merge request famedly/conduit!435
|
2022-12-18 05:05:33 +00:00 |
|
Timo Kösters
|
f1d2574651
|
finish upgrade ruma
|
2022-12-17 09:28:08 +01:00 |
|
Jonas Platte
|
d39ce1401d
|
WIP: Upgrade Ruma
|
2022-12-16 11:57:32 +01:00 |
|