Jonas Zohren
e03a2b8636
chore(docker): Bump base image to alpine 3.16.0
2022-06-18 11:05:42 +00:00
Jonas Zohren
8bb58061fd
Merge branch 'adopt-aur-patches' into 'next'
...
Adjust some files to the AUR patches
See merge request famedly/conduit!351
2022-05-10 07:26:20 +00:00
Jonas Zohren
8392809eb1
Adjust some files to the AUR patches
2022-05-10 07:26:19 +00:00
Timo Kösters
2fcb3c8b93
Merge branch '262-missing_room_keys_endpoint' into 'next'
...
feat: re-register missing add_backup_keys route
Closes #262
See merge request famedly/conduit!346
2022-04-11 16:05:59 +00:00
Jakub Kubík
729d66aa11
feat: register missing add_backup_keys route
2022-04-10 14:56:43 +02:00
Timo Kösters
6e106b5732
Merge branch 'v9' into 'next'
...
Support all room versions from V3 to V9
Closes #161
See merge request famedly/conduit!257
2022-04-07 15:27:58 +00:00
Timo Kösters
00b362b43b
fix: cors warning
2022-04-07 17:09:07 +02:00
Timo Kösters
b6b27b66c8
fix: don't allow unjoined users to send typing notifications
2022-04-07 17:07:33 +02:00
Timo Kösters
3573d40027
fix warnings
2022-04-07 17:04:29 +02:00
Timo Kösters
e4600ccfef
bump ruma
2022-04-07 17:02:49 +02:00
Timo Kösters
0ae39807a4
Add V9 to list of allowed versions
2022-04-07 16:50:09 +02:00
Timo Kösters
686319e2e3
fix: error handling
2022-04-07 16:50:07 +02:00
Nyaaori
d655f4c1be
Cleanup rooms.rs, globals.rs, and pdu.rs
2022-04-07 16:48:37 +02:00
Nyaaori
4b28146ee7
Support room version 3
2022-04-07 16:44:50 +02:00
Nyaaori
d8a3b257f2
Enable room version 4
2022-04-07 16:36:27 +02:00
Nyaaori
714873694d
Refactor room version support, add default room version config
2022-04-07 16:35:10 +02:00
Timo Kösters
d81216cad7
improvement: preparing for room version 9
2022-04-07 16:26:50 +02:00
Timo Kösters
9e29dc808f
Merge branch '198-support-user-password-resets' into 'next'
...
feat: support user password resets
Closes #198
See merge request famedly/conduit!339
2022-04-07 12:11:55 +00:00
Jakub Kubík
ada07de204
feat: support user password resets
2022-04-07 12:11:55 +00:00
Timo Kösters
2556e29984
Merge branch 'up-ruma-went-too-far' into 'next'
...
Upgrade Ruma
See merge request famedly/conduit!342
2022-04-07 11:37:53 +00:00
Timo Kösters
df4c38cb61
fix: remove warnings
2022-04-07 13:22:32 +02:00
Timo Kösters
2808dd2000
Ruma upgrade
2022-04-07 12:58:48 +02:00
Timo Kösters
17ad5f0595
fix: checks for incoming cross signing changes
2022-04-07 12:56:18 +02:00
Timo Kösters
b8411ae2fd
refactor: rename endpoints to match ruma
2022-04-07 12:56:17 +02:00
Timo Kösters
566833111c
refactor: small improvements
2022-04-07 12:56:16 +02:00
chenyuqide
ee96a03d60
Update ruma
2022-04-07 12:56:16 +02:00
chenyuqide
21bc099ccf
Update ruma
2022-04-07 12:56:12 +02:00
Timo Kösters
1ce03059a0
Merge branch 'next' into 'next'
...
Fix wrong associated type in OutgoingKind::Appservice
See merge request famedly/conduit!324
2022-04-03 19:48:25 +00:00
Timo Kösters
9ed352d4c0
Merge branch '199-fix-kick-ban-over-federation' into 'next'
...
fix: fix kick and ban events over federation
Closes #199
See merge request famedly/conduit!338
2022-04-03 17:59:15 +00:00
Jakub Kubík
a08c667230
docs: add comments for clarification of recent changes
2022-04-03 19:27:48 +02:00
Jakub Kubík
414c7c40c4
fix: remove our server from the list of servers to send the event PDU to
2022-04-03 19:19:57 +02:00
Jakub Kubík
1712e63e06
fix: fix kick and ban events over federation
...
Fix the scenario where a MembershipState change event was not sent to the server of a user kicked/banned from a room on a Conduit instance if there were not any other users from that server in the room.
2022-04-03 18:58:45 +02:00
Timo Kösters
272e27ae01
Merge branch 'appservice-pdu-send-fix' into 'next'
...
Send PDU to appservice if state_key is their user ID
Closes #110
See merge request famedly/conduit!331
2022-04-03 12:32:23 +00:00
Andrej Kacian
9046223e7f
Send PDU to appservice if state_key is their user ID
...
Fixes #110 .
2022-04-01 19:38:38 +02:00
Timo Kösters
0066f20bdd
Merge branch 'trailingslash' into 'next'
...
fix: allow trailing slashes for /state/<type>/ again
See merge request famedly/conduit!336
2022-04-01 14:17:21 +00:00
Timo Kösters
a5465dfd3e
fix: allow trailing slashes for /state/<type>/ again
2022-04-01 16:00:04 +02:00
Timo Kösters
8086bee146
Merge branch 'show-config' into 'next'
...
Add show-config admin command
See merge request famedly/conduit!295
2022-04-01 09:01:00 +00:00
Timo Kösters
b11a3b80bc
Merge branch 'shutdown-msg' into 'next'
...
Log caught Ctrl+C or SIGTERM for operator feedback
See merge request famedly/conduit!319
2022-04-01 08:49:28 +00:00
Timo Kösters
554146f46e
Merge branch 'notify-admin-room-on-user-register' into 'next'
...
Notify admin room for user registrations, deactivations and password changes
See merge request famedly/conduit!318
2022-04-01 08:41:51 +00:00
Timo Kösters
7bc84dc971
Merge branch 'jplatte/up-axum' into 'next'
...
Upgrade axum to 0.5
See merge request famedly/conduit!335
2022-04-01 08:33:22 +00:00
Timo Kösters
d89141100c
Merge branch 'insensitive-login' into 'next'
...
Case insensitive username login
Closes #248
See merge request famedly/conduit!323
2022-04-01 08:20:45 +00:00
Timo Kösters
f9bf465578
Merge branch 'readable' into 'next'
...
Fix security issue.
See merge request famedly/conduit!316
2022-04-01 07:30:05 +00:00
Jonas Platte
3933bd9a8e
Update axum feature set used
2022-03-31 22:52:16 +02:00
Jonas Platte
db0659cb3d
Upgrade axum to 0.5
2022-03-31 22:50:17 +02:00
Timo Kösters
1219535e56
Merge branch 'fix/bad-uid-crash' into 'next'
...
Fix crash when a bad user ID is in the database
See merge request famedly/conduit!334
2022-03-31 19:23:41 +00:00
4a12a7cbc8
Fix crash when a bad user ID is in the database
...
To my understanding, a bad user ID can sometimes make it into the
database, which lead to a panic prior to this change.
2022-03-31 20:59:59 +02:00
Jonas Zohren
08072d2c8d
Merge branch 'docker/ci-bump-alpine-version' into 'next'
...
chore: Bump alpine version for CI generated docker
See merge request famedly/conduit!333
2022-03-30 20:30:56 +00:00
Jonas Zohren
1ebf417c11
chore: Bump alpine version for CI generated docker
2022-03-30 20:23:04 +00:00
Jonas Zohren
a2a7c61872
Merge branch 'docker-bump-alpine-version' into 'next'
...
chore(docker): Bump alpine (base image) version
Closes #255
See merge request famedly/conduit!330
2022-03-18 17:52:50 +00:00
Jonas Zohren
61277452af
chore(docker): Bump alpine (base image) version
2022-03-18 18:44:05 +01:00
