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 |
|
x4u
|
82f31d6b72
|
Replace nogroup with dedicated user group
|
2023-07-23 14:21:36 +08:00 |
|
Charles Hall
|
6ae5143ff5
|
only listen on IPv6 since that's what conduit does
|
2023-07-21 12:12:37 -07:00 |
|
Charles Hall
|
742331e054
|
Revert "only use musl on x86_64"
This reverts commit 56f0f3dfa4.
This shouldn't be needed anymore since [this][0] reached nixos-unstable.
[0]: https://github.com/NixOS/nixpkgs/pull/242889
|
2023-07-16 13:48:05 -07:00 |
|
Charles Hall
|
abd8e1bf54
|
nixpkgs' rocksdb is now new enough :)
This reverts commit abd0a014e8.
|
2023-07-16 13:47:42 -07:00 |
|
Charles Hall
|
fa3b1fd9bd
|
update flake.lock
Flake lock file updates:
• Updated input 'crane':
'github:ipetkov/crane/75f7d715f8088f741be9981405f6444e2d49efdd' (2023-06-13)
→ 'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07)
• Updated input 'crane/rust-overlay':
'github:oxalica/rust-overlay/c535b4f3327910c96dcf21851bbdd074d0760290' (2023-06-03)
→ 'github:oxalica/rust-overlay/f9b92316727af9e6c7fee4a761242f7f46880329' (2023-07-03)
• Updated input 'fenix':
'github:nix-community/fenix/df0a6e4ec44b4a276acfa5a96d2a83cb2dfdc791' (2023-06-17)
→ 'github:nix-community/fenix/39096fe3f379036ff4a5fa198950b8e79defe939' (2023-07-16)
• Updated input 'fenix/rust-analyzer-src':
'github:rust-lang/rust-analyzer/a5a71c75e62a0eaa1b42a376f7cf3d348cb5dec6' (2023-06-16)
→ 'github:rust-lang/rust-analyzer/996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8' (2023-07-15)
• Updated input 'flake-utils':
'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
→ 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/04af42f3b31dba0ef742d254456dc4c14eedac86' (2023-06-17)
→ 'github:NixOS/nixpkgs/8acef304efe70152463a6399f73e636bcc363813' (2023-07-15)
|
2023-07-16 13:37:40 -07: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 |
|
Charles Hall
|
56f0f3dfa4
|
only use musl on x86_64
Since that's all I've tested it on. Apparently this caused issues on
aarch64 even though it allegedly shouldn't.
|
2023-07-10 11:06:19 -07: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 |
|
Jonas Zohren
|
eab5dac6e8
|
Merge branch 'fix-docker-build-image-size' into 'next'
ci: Fix "0 B" image size display
See merge request famedly/conduit!499
|
2023-07-04 21:18:25 +00:00 |
|
Jonas Zohren
|
c4824a6ebc
|
ci: Fix "0 B" image size display
works around gitlab issue https://gitlab.com/gitlab-org/gitlab/-/issues/388865#workaround
|
2023-07-04 21:13:11 +00: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 |
|
Jacob Taylor
|
2640f67e4b
|
remove comments
|
2023-07-02 18:00:30 +00: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 |
|
Jonas Platte
|
0ded637b4a
|
Upgrade axum to 0.6
|
2023-06-29 11:20:52 +02:00 |
|
Jacob Taylor
|
dc50197a13
|
update example configurations in DEPLOY.md for Apache and Nginx which include upstream proxy timeouts of 5 minutes to allow for room joins which take a while
|
2023-06-29 02:42:32 +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 |
|
Jonas Zohren
|
26b8605fa0
|
ci: Adjust to current docker
|
2023-06-26 22:26:33 +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 |
|