Timo Kösters
|
1e560529d8
|
Merge branch 'nix-upkeep' into 'next'
Nix upkeep
See merge request famedly/conduit!505
|
2023-07-23 09:23:41 +00:00 |
|
Timo Kösters
|
ff98444d03
|
Merge branch 'nogroup' into 'next'
[Security fix] Create dedicated user group
See merge request famedly/conduit!509
|
2023-07-23 09:22:39 +00:00 |
|
Timo Kösters
|
e9946f81a0
|
Merge branch 'e2eefed' into 'next'
fix: e2ee over federation
See merge request famedly/conduit!504
|
2023-07-16 14:54:44 +00:00 |
|
Timo Kösters
|
a9ba067e77
|
fix: e2ee over federation
|
2023-07-16 16:50:03 +02:00 |
|
Timo Kösters
|
706148f941
|
Merge branch 'nhekobug' into 'next'
fix: nheko e2ee verification bug
See merge request famedly/conduit!503
|
2023-07-15 21:46:12 +00:00 |
|
Timo Kösters
|
24402312c5
|
fix: could not verify own events
|
2023-07-15 23:43:25 +02:00 |
|
Timo Kösters
|
3c6ffd88bf
|
Merge branch 'unbreak-aarch64-nix' into 'next'
only use musl on x86_64
See merge request famedly/conduit!502
|
2023-07-11 14:11:45 +00:00 |
|
Timo Kösters
|
c3966f501c
|
fix: nheko e2ee verification bug
|
2023-07-10 23:10:27 +02:00 |
|
Timo Kösters
|
ad06d475de
|
Merge branch 'sliding' into 'next'
Very basic Element X support and fixes
See merge request famedly/conduit!501
|
2023-07-10 14:35:35 +00:00 |
|
Timo Kösters
|
0b4e3de9c0
|
fix: spaces with restricted rooms
|
2023-07-10 16:28:08 +02:00 |
|
Timo Kösters
|
edd4a3733f
|
fix: actually clear memory in the admin commands
|
2023-07-10 16:27:42 +02:00 |
|
Timo Kösters
|
c17187777f
|
fix: never try federation with self
|
2023-07-10 16:26:36 +02:00 |
|
Timo Kösters
|
78e7b711df
|
fix: better sliding sync
|
2023-07-10 16:25:33 +02:00 |
|
Timo Kösters
|
4b7d3e24dd
|
bump ruma
|
2023-07-10 16:24:57 +02:00 |
|
Timo Kösters
|
e4f769963f
|
feat: very simple sliding sync implementation
|
2023-07-06 10:32:25 +02:00 |
|
Timo Kösters
|
f8a36e7554
|
Merge branch 'memory' into 'next'
improvement: better memory usage and admin commands to analyze it
See merge request famedly/conduit!497
|
2023-07-03 17:43:27 +00:00 |
|
Timo Kösters
|
a2c3256ced
|
improvement: better memory usage and admin commands to analyze it
|
2023-07-03 19:41:07 +02:00 |
|
Timo Kösters
|
833c1505f1
|
Merge branch 'hierarchy' into 'next'
feat: space hierarchies
See merge request famedly/conduit!495
|
2023-07-03 13:56:47 +00:00 |
|
Timo Kösters
|
bac13d08ae
|
fix: cache invalidation
|
2023-07-02 22:50:50 +02:00 |
|
Timo Kösters
|
f0a27dcb00
|
Merge branch 'next' into 'next'
update example configurations in DEPLOY.md for Apache and Nginx which include...
See merge request famedly/conduit!493
|
2023-07-02 20:20:31 +00:00 |
|
Timo Kösters
|
9d49d599f3
|
feat: space hierarchies
|
2023-07-02 22:12:06 +02:00 |
|
Timo Kösters
|
eb8bc1af8d
|
Merge branch 'jplatte/axum06' into 'next'
Upgrade axum to 0.6
See merge request famedly/conduit!494
|
2023-07-02 07:02:04 +00:00 |
|
Timo Kösters
|
6a6f8e80f1
|
Merge branch 'joinfix' into 'next'
improvement: randomize server order for alias joins
See merge request famedly/conduit!491
|
2023-06-28 15:47:36 +00:00 |
|
Timo Kösters
|
fd1ccbd3ad
|
improvement: randomize server order for alias joins
|
2023-06-28 17:44:30 +02:00 |
|
Timo Kösters
|
3a1a72df98
|
Merge branch 'stateres' into 'next'
Make state resolution more resistant and some sync performance improvements
See merge request famedly/conduit!490
|
2023-06-28 10:46:32 +00:00 |
|
Timo Kösters
|
84784970b2
|
Merge branch 'fix/docker-ci-pipeline' into 'next'
ci: Adjust to current docker
See merge request famedly/conduit!488
|
2023-06-27 18:54:40 +00:00 |
|
Timo Kösters
|
d64a56d88b
|
Do soft fail check before doing state res to allow leave events
|
2023-06-27 18:48:34 +02:00 |
|
Timo Kösters
|
be877ef719
|
Improve sync performance with more caching and wrapping things in Arcs to avoid copies
|
2023-06-27 13:15:11 +02:00 |
|
Timo Kösters
|
7c6d25dcd1
|
Do state res even if the event soft fails
|
2023-06-27 13:13:33 +02:00 |
|
Timo Kösters
|
b671238aa0
|
Merge branch 'rumafix' into 'next'
bump ruma
See merge request famedly/conduit!489
|
2023-06-26 21:11:20 +00:00 |
|
Timo Kösters
|
91180e011d
|
bump ruma
|
2023-06-26 23:10:26 +02:00 |
|
Timo Kösters
|
dbd360ebb9
|
Merge branch 'unbreak' into 'next'
fix rustc version, nix upkeep
See merge request famedly/conduit!482
|
2023-06-26 19:12:46 +00:00 |
|
Timo Kösters
|
48e6e0659f
|
Merge branch 'relations' into 'next'
Add relations endpoints, edits and threads work now
See merge request famedly/conduit!487
|
2023-06-26 19:11:57 +00:00 |
|
Timo Kösters
|
72eb1972c1
|
Add relations endpoints, edits and threads work now
|
2023-06-26 12:38:51 +02:00 |
|
Timo Kösters
|
63cbaedb79
|
Merge branch 'bearerfix' into 'next'
fix: send correct bearer token to appservices
Closes #358
See merge request famedly/conduit!486
|
2023-06-26 07:16:20 +00:00 |
|
Timo Kösters
|
db6def8800
|
fix: send correct bearer token to appservices
|
2023-06-26 09:15:52 +02:00 |
|
Timo Kösters
|
caa841c434
|
Merge branch 'contextfix' into 'next'
fix: /context for element android. start and end must be set even with limit=0
See merge request famedly/conduit!485
|
2023-06-26 06:34:10 +00:00 |
|
Timo Kösters
|
49a0f3a60d
|
fix: /context for element android. start and end must be set even with limit=0
|
2023-06-26 08:33:31 +02:00 |
|
Timo Kösters
|
bac82f43af
|
Merge branch 'compressionoff' into 'next'
Disable compression, see https://en.wikipedia.org/wiki/BREACH
See merge request famedly/conduit!484
|
2023-06-25 21:46:34 +00:00 |
|
Timo Kösters
|
15cc801840
|
Disable compression, see https://en.wikipedia.org/wiki/BREACH
|
2023-06-25 23:43:54 +02:00 |
|
Timo Kösters
|
5f9ca8e458
|
Merge branch 'threads' into 'next'
feat: WIP relationships and threads
See merge request famedly/conduit!483
|
2023-06-25 20:59:53 +00:00 |
|
Timo Kösters
|
c7e0ea525a
|
feat: WIP relationships and threads
|
2023-06-25 19:40:33 +02:00 |
|
Timo Kösters
|
def079267d
|
Merge branch 'adjust-to-rust-version-bumps' into 'next'
chore(ci): Adjust to rust version bumps
See merge request famedly/conduit!479
|
2023-06-10 15:35:22 +00:00 |
|
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 |
|