Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,874 Commits 157 Branches 36 Tags
a3a9b60abc39fd9d140a67831761d598887f195c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Timo Kösters 808b12f618 Merge branch 'restricted' into 'next' 
fix: restricted room error is now FORBIDDEN

See merge request famedly/conduit!478
 2023-06-08 18:52:03 +00:00
Timo Kösters faa9208a3e cargo fmt 2023-06-08 20:51:34 +02:00
Timo Kösters 1ea27c4f97 fix: restricted room error is now FORBIDDEN 2023-06-08 20:49:42 +02:00
Timo Kösters 422ee40107 Merge branch 'mr-conduit-appservice-login' into 'next' 
feat: support end to bridge encryption

See merge request famedly/conduit!454
 2023-05-26 12:48:23 +00:00
Timo Kösters 0280fa5793 Merge branch 'next' into 'next' 
fix nix readme to work with ipv6

See merge request famedly/conduit!475
 2023-05-26 12:30:02 +00:00
Timo Kösters c38df57279 Merge branch 'deploymd' into 'next' 
Minor DEPLOY.md changes

See merge request famedly/conduit!473
 2023-05-21 13:17:29 +00:00
Timo Kösters 4e2bbf9d6a Minor DEPLOY.md changes 2023-05-21 15:16:23 +02:00
Timo Kösters 7a9ec851fc Merge branch 'bump' into 'next' 
Bump dependencies

See merge request famedly/conduit!472
 2023-05-21 11:45:20 +00:00
Timo Kösters d62cd2ae51 chore: bump dependencies 2023-05-21 13:42:59 +02:00
Timo Kösters 49b5af6d45 chore: bump rocksdb 2023-05-21 13:41:51 +02:00
Timo Kösters 1f1444da8c Merge branch 'pushrules' into 'next' 
Improvements to pushrules endpoints

Closes #316

See merge request famedly/conduit!461
 2023-05-21 10:41:31 +00:00
Timo Kösters 2a9a908343 Merge branch 'x4u/add-apache-cloudflare-deploy-info' into 'next' 
X4u/add apache cloudflare deploy info

See merge request famedly/conduit!471
 2023-05-21 07:04:59 +00:00
Timo Kösters dbbd164e39 Merge branch 'admin-command-fix' into 'next' 
Recognize admin commands without : after tag

See merge request famedly/conduit!470
 2023-05-17 19:09:54 +00:00
Timo Kösters 1b9e63f426 Merge branch 'unbreak-nix' into 'next' 
Fix Nix builds (actually) (for real) (it seriously builds this time)

See merge request famedly/conduit!466
 2023-04-05 09:59:09 +00:00
Timo Kösters f704169aeb Merge branch 'fixjoin' into 'next' 
fix: let requests continue event if client disconnects

See merge request famedly/conduit!464
 2023-03-18 07:59:36 +00:00
Timo Kösters 2a7c4693b8 fix: don't accept new requests when shutting down 2023-03-18 08:58:20 +01:00
Timo Kösters da3871f39a fix: let requests continue event if client disconnects 2023-03-17 22:45:13 +01:00
Timo Kösters 664ee7d89a Merge branch 'backfill' into 'next' 
feat: handle backfill requests

See merge request famedly/conduit!459
 2023-03-16 13:32:42 +00:00
Timo Kösters 42b12934e3 Don't crash when a room errors 2023-03-13 10:43:09 +01:00
Timo Kösters 63f787f635 Reduce logs from info to debug 2023-03-13 10:39:19 +01:00
Timo Kösters a1bd348977 fix: history visibility 2023-03-13 10:39:19 +01:00
Timo Kösters 27f29ba699 fix: SRV lookups should end with a period 2023-03-13 10:39:19 +01:00
Timo Kösters cb0ce5b08f Logs for server resolution 2023-03-13 10:39:18 +01:00
Timo Kösters b7c99788e4 All the logs 2023-03-13 10:39:18 +01:00
Timo Kösters 2316d89048 Even more logging 2023-03-13 10:39:18 +01:00
Timo Kösters bde4880c1d fix: don't unwrap server keys 2023-03-13 10:39:18 +01:00
Timo Kösters 8b648d0d3f fix: force abort federation requests after 2 minutes 2023-03-13 10:39:18 +01:00
Timo Kösters 4617ee2b6b More logging for remote joins 2023-03-13 10:39:18 +01:00
Timo Kösters 10fa686c77 feat: respect history visibility 2023-03-13 10:39:18 +01:00
Timo Kösters 2a16a5e967 fix: don't send nulls as unsigned content 2023-03-13 10:39:17 +01:00
Timo Kösters 2aa0a2474b fix: ignore unparsable pdus in /send 2023-03-13 10:39:17 +01:00
Timo Kösters d39003ffc0 Allow backfilling create event itself 2023-03-13 10:39:17 +01:00
Timo Kösters eae0989c40 fix: refactor backfill and add support for search 2023-03-13 10:39:17 +01:00
Timo Kösters 17a6431f5f fix: make backfilled events reachable 2023-03-13 10:39:17 +01:00
Timo Kösters fcfb06ffa6 fix: allow handling create event itself 2023-03-13 10:39:17 +01:00
Timo Kösters 7bdd9660aa feat: ask for backfill 2023-03-13 10:39:17 +01:00
Timo Kösters 23b18d71ee feat: handle backfill requests 
Based on https://gitlab.com/famedly/conduit/-/merge_requests/421
 2023-03-13 10:39:16 +01:00
Timo Kösters 84cfed5231 Merge branch 'fix-nix-build' into 'next' 
Fix Nix flake build

See merge request famedly/conduit!456
 2023-02-18 21:18:51 +00:00
Timo Kösters cdcf4a017d Merge branch 'fixreset' into 'next' 
fix: allow reactivation of users using reset-password admin command

See merge request famedly/conduit!458
 2023-02-11 11:49:54 +00:00
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
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