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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
2022-12-16 08:38:49 +00:00 |
|
Timo Kösters
|
5894d35eb2
|
Merge branch 'fixrestrictedjoin' into 'next'
fix: rejoining restricted rooms over federation
See merge request famedly/conduit!431
|
2022-11-30 21:32:12 +00:00 |
|
Timo Kösters
|
b9fd6127e2
|
fix: rejoining restricted rooms over federation
|
2022-11-30 22:30:55 +01:00 |
|
Timo Kösters
|
f4dd051a1d
|
Merge branch 'sd-notify' into 'next'
call sd-notify after init and before exit
See merge request famedly/conduit!426
|
2022-11-28 15:50:12 +00:00 |
|
Timo Kösters
|
396dac6d82
|
Merge branch 'fixroomleave' into 'next'
fix: unable to leave room
See merge request famedly/conduit!419
|
2022-11-21 20:04:27 +00:00 |
|
Timo Kösters
|
9149be31af
|
Merge branch 'logs-cleanup' into 'next'
Clean some noisy logs
See merge request famedly/conduit!423
|
2022-11-21 20:03:17 +00:00 |
|
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
|
2022-11-21 20:02:20 +00:00 |
|
Timo Kösters
|
e3dabdf525
|
Merge branch 'Nyaaori/cleanup' into 'next'
misc. cleanup
See merge request famedly/conduit!420
|
2022-11-21 19:59:45 +00:00 |
|
Timo Kösters
|
3b3c451c83
|
fix: unable to leave room
|
2022-11-21 19:50:48 +01:00 |
|
Timo Kösters
|
cf99316082
|
Merge branch 'dendritefix' into 'next'
Dendrite invite fix
See merge request famedly/conduit!416
|
2022-11-09 20:27:22 +00:00 |
|
Timo Kösters
|
c063700255
|
fix: invite dendrite users
|
2022-11-09 21:14:17 +01:00 |
|
Timo Kösters
|
7540227388
|
chore: bump dependencies
|
2022-11-09 18:46:10 +01:00 |
|
Timo Kösters
|
ccdaaceb33
|
Merge branch 'ci-revamp-2022-10' into 'next'
Fix CI
See merge request famedly/conduit!414
|
2022-11-02 16:47:48 +00:00 |
|
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
|
2022-10-31 11:35:55 +00:00 |
|
Timo Kösters
|
2a52f666dc
|
Merge branch 'fixtyping' into 'next'
Fix typing indicators and unencrypted messages in encrypted rooms
See merge request famedly/conduit!409
|
2022-10-30 20:25:45 +00:00 |
|
Timo Kösters
|
0cf6545116
|
fix: not sending enough state on join
|
2022-10-30 21:23:43 +01:00 |
|
Timo Kösters
|
5d691f405e
|
fix: stuck typing indicators
|
2022-10-30 21:22:32 +01:00 |
|
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
|
2022-10-30 19:45:58 +00:00 |
|
Timo Kösters
|
9548c84d32
|
Merge branch 'fixnotifcount' into 'next'
fix: element android did not reset notification counts
See merge request famedly/conduit!408
|
2022-10-30 19:43:39 +00:00 |
|
Timo Kösters
|
02dd3d32f2
|
fix: element android did not reset notification counts
|
2022-10-30 20:41:32 +01:00 |
|
Timo Kösters
|
7c98ba64aa
|
fix: HEAD requests should produce METHOD_NOT_ALLOWED
|
2022-10-30 19:53:05 +01:00 |
|
Timo Kösters
|
e86fb11512
|
Merge branch 'nabulator-next-patch-84388' into 'next'
Update nginx configuration to allow for larger uploads.
See merge request famedly/conduit!407
|
2022-10-28 13:32:02 +00:00 |
|
Timo Kösters
|
20e3c42456
|
Merge branch 'add-nix-flake' into 'next'
add nix flake
See merge request famedly/conduit!403
|
2022-10-28 13:31:21 +00:00 |
|
Timo Kösters
|
876fdf480d
|
Merge branch '3pid_403_next' into 'next'
Return 403 to 3pid token routes to signal not implemented
See merge request famedly/conduit!375
|
2022-10-25 20:47:41 +00:00 |
|
Timo Kösters
|
4af998963b
|
Merge branch 'fix-axum-request-size' into 'next'
fix(main): fix request size limit to max_request_size (axum defaults 2MB)
See merge request famedly/conduit!406
|
2022-10-25 20:34:33 +00:00 |
|
Timo Kösters
|
cb2b5beea8
|
Merge branch 'fix_persy' into 'next'
fix: update persy implementation after refactor
See merge request famedly/conduit!396
|
2022-10-15 12:13:36 +00:00 |
|
Timo Kösters
|
2231a69b4c
|
fix: make previous MR compile
|
2022-10-15 14:07:27 +02:00 |
|
Timo Kösters
|
13052388a7
|
Merge branch 'conduit-next' into next
|
2022-10-15 13:55:39 +02:00 |
|
Timo Kösters
|
2627ca5e3d
|
Merge branch 'update-rust' into 'next'
update rust to avoid a cargo problem
See merge request famedly/conduit!395
|
2022-10-15 11:50:55 +00:00 |
|
Timo Kösters
|
ed5b8d6a46
|
Merge branch 'Nyaaori/fix-whoami-appservices' into 'next'
Fix is_guest value on whoami for appservice users
Closes #310
See merge request famedly/conduit!401
|
2022-10-15 11:32:49 +00:00 |
|
Timo Kösters
|
3054af41ba
|
Merge branch 'Nyaaori/bump-default-room-version' into 'next'
Bump default room version to V9
See merge request famedly/conduit!400
|
2022-10-15 11:02:44 +00:00 |
|
Timo Kösters
|
b1991c8f4f
|
Merge branch 'Nyaaori/rejoin-fix' into 'next'
Rejoin over federation if we are not participating
See merge request famedly/conduit!399
|
2022-10-15 09:56:55 +00:00 |
|
Timo Kösters
|
6f7f2820ce
|
Merge branch 'Nyaaori/restricted-join-fix' into 'next'
Fix doing restricted joins into rooms we are not participating in
See merge request famedly/conduit!398
|
2022-10-15 09:50:25 +00:00 |
|
Timo Kösters
|
aca6218c0a
|
Merge branch 'unrecognizedmethods' into 'next'
fix: send unrecognized error on wrong http methods
See merge request famedly/conduit!397
|
2022-10-15 08:35:39 +00:00 |
|
Timo Kösters
|
3a45628e1d
|
fix: send unrecognized error on wrong http methods
|
2022-10-15 00:28:43 +02:00 |
|
Timo Kösters
|
c948324cf2
|
Merge branch 'fix-admin-help' into 'next'
fix `@conduit help` not working in the admin room
See merge request famedly/conduit!392
|
2022-10-13 11:15:49 +00:00 |
|
Timo Kösters
|
ce188daccb
|
Merge branch 'conduit-lower-default-log-level' into HEAD
|
2022-10-13 13:13:03 +02:00 |
|
Timo Kösters
|
175fba5739
|
Merge branch 'fix-login-token' into 'next'
fix(client/login): username in lowercase for login by token
See merge request famedly/conduit!380
|
2022-10-13 11:08:04 +00:00 |
|
Timo Kösters
|
f46d64e52f
|
Merge branch 'unstability' into 'next'
Mark unstable versions as unstable in /capabilities
See merge request famedly/conduit!394
|
2022-10-13 09:39:45 +00:00 |
|
Timo Kösters
|
8c6e75a0cd
|
Mark unstable versions as unstable in /capabilities
|
2022-10-13 10:27:42 +02:00 |
|
Timo Kösters
|
c23b4946c5
|
Merge branch 'fixallthebugs' into 'next'
fix: all the e2ee problems
See merge request famedly/conduit!393
|
2022-10-13 08:21:12 +00:00 |
|
Timo Kösters
|
ac52b234fa
|
fix: all the e2ee problems
|
2022-10-13 10:15:35 +02:00 |
|
Timo Kösters
|
37eb686b5b
|
Merge branch 'fixfluffy' into 'next'
fix: fluffychat login works again
See merge request famedly/conduit!391
|
2022-10-12 15:37:50 +00:00 |
|
Timo Kösters
|
fdd64fc966
|
fix: fluffychat login works again
|
2022-10-12 17:18:01 +02:00 |
|
Timo Kösters
|
4d982d05af
|
Merge branch 'claimfast' into 'next'
improvement: more efficient /claim
See merge request famedly/conduit!389
|
2022-10-12 09:09:23 +00:00 |
|
Timo Kösters
|
1e725bc548
|
Merge branch 'fixmakejoin' into 'next'
fix: make join should not send event id
See merge request famedly/conduit!390
|
2022-10-12 09:08:58 +00:00 |
|
Timo Kösters
|
dd8f4681a2
|
fix: make join should not send event id
|
2022-10-12 10:57:54 +02:00 |
|
Timo Kösters
|
0290f1f355
|
improvement: more efficient /claim
|
2022-10-12 10:43:30 +02:00 |
|
Timo Kösters
|
cd835fc7a8
|
Merge branch 'initialSyncFix' into 'next'
Initial sync fix
See merge request famedly/conduit!388
|
2022-10-11 21:24:19 +00:00 |
|
Timo Kösters
|
2b70d9604a
|
fix: element gets stuck in /initialSync
|
2022-10-11 23:07:03 +02:00 |
|
Timo Kösters
|
d3968c2fd1
|
fix: bump ruma again to fix state res problems
|
2022-10-11 21:51:20 +02:00 |
|
Timo Kösters
|
8105c5cc60
|
cargo fmt
|
2022-10-11 18:10:51 +02:00 |
|
Timo Kösters
|
d1e5acd7b3
|
fix: don't panic on missing events in state
|
2022-10-11 17:59:49 +02:00 |
|
Timo Kösters
|
68227c06c3
|
fix: state for left rooms
|
2022-10-11 17:10:56 +02:00 |
|
Timo Kösters
|
31d1801912
|
fix: workaround for missing avatars on element and rooms becoming historical
|
2022-10-11 17:10:09 +02:00 |
|
Timo Kösters
|
fb6bfa9753
|
fix: missing field origin error with synapse servers
|
2022-10-11 15:25:10 +02:00 |
|
Timo Kösters
|
c30cc6120b
|
fix: send right errors on make/send join in restricted rooms
|
2022-10-11 11:53:13 +02:00 |
|
Timo Kösters
|
c2a5315e9f
|
Merge branch 'm0dex/fix-signature-upload' into 'next'
fix(client/keys): ignore all but signed keys in signature upload route
See merge request famedly/conduit!378
|
2022-10-10 14:42:23 +02:00 |
|
Timo Kösters
|
a10dae38e2
|
Merge branch 'v4' into 'next'
Bump version to 0.4
See merge request famedly/conduit!368
|
2022-10-10 14:38:56 +02:00 |
|
Timo Kösters
|
7cf060ae5b
|
Bump version to 0.4
|
2022-10-10 14:38:17 +02:00 |
|
Timo Kösters
|
de9b0cec50
|
Merge branch 'lightning_bolt_option' into 'next'
Lightning bolt optional
See merge request famedly/conduit!366
|
2022-10-10 14:35:56 +02:00 |
|
Timo Kösters
|
ca82b2940d
|
fix: sending does not work
We were inserting one too many 0xff bytes
|
2022-10-10 14:02:05 +02:00 |
|
Timo Kösters
|
229444c932
|
Use ring-compat feature so out signing keys work again
|
2022-10-10 14:02:04 +02:00 |
|
Timo Kösters
|
076e9810ba
|
cargo fix
|
2022-10-10 14:02:04 +02:00 |
|
Timo Kösters
|
6b131202b9
|
Bump ruma
|
2022-10-10 14:02:04 +02:00 |
|
Timo Kösters
|
275c6b447d
|
Bump some dependencies
|
2022-10-10 14:02:04 +02:00 |
|
Timo Kösters
|
1a7893dbbd
|
fix: update state_cache on join over federation
|
2022-10-10 14:02:03 +02:00 |
|
Timo Kösters
|
5a04559cb4
|
fix: maintain server list again
|
2022-10-10 14:02:03 +02:00 |
|
Timo Kösters
|
25c3d89f28
|
Bump rust version for const fn RwLock::new
|
2022-10-10 14:02:03 +02:00 |
|
Timo Kösters
|
8b5b7a1f63
|
fix: panic on launch
Now we start the admin and sending threads at a later time.
|
2022-10-10 14:02:02 +02:00 |
|
Timo Kösters
|
50b0eb9929
|
cargo fix
|
2022-10-10 14:02:02 +02:00 |
|
Timo Kösters
|
7822a385bb
|
cargo fmt
|
2022-10-10 14:02:02 +02:00 |
|