MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-16 16:10:51 +01:00
Code Issues Releases Activity
2008 commits 50 branches 6 tags 12 MiB
Commit graph

2008 commits

This branch
This branch
All branches
Author SHA1 Message Date
Timo Kösters
fa725a14e2 Merge branch 'lukehmcc-next-patch-37096' into 'next' 
Update README.md to fix typo & fix compatibility with new versions of docker compose

See merge request famedly/conduit!545
 2023-09-11 18:34:06 +00:00
Luke McCarthy
9b3664aeeb Update README.md to fix typo & fix compatibility with new versions of docker compose 2023-08-27 02:14:03 +00:00
Jonas Zohren
90fea00dc7 Merge branch 'docs-docker-coturn' into 'next' 
Docs: coturn instructions for docker

See merge request famedly/conduit!498
 2023-08-23 14:18:42 +00:00
Jonas Zohren
20924a44f1 Suggestion on how to generate a secure key 2023-08-23 11:17:47 +02:00
purplemeteorite
38d6426b0e coturn setup instructions for docker 2023-08-23 11:09:21 +02:00
Timo Kösters
6dfb262ddf Merge branch 'patch-3' into 'next' 
log handling previous event time as debug

See merge request famedly/conduit!540
 2023-08-11 09:27:42 +00:00
Timo Kösters
75cdc3a1f6 Merge branch 'roomversionwarnings' into 'next' 
Do not show "Invalid room version" errors when server is not in room

See merge request famedly/conduit!541
 2023-08-11 09:27:23 +00:00
Timo Kösters
11103a92ed
Do not show "Invalid room version" errors when server is not in room 2023-08-11 10:48:48 +02:00
girlbossceo
ce2017a10e log handling previous event time as debug 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-08-10 23:12:37 +00:00
Timo Kösters
0c2cfda3ae Merge branch 'next' into 'master' 
Merge remote-tracking branch 'origin/next'

See merge request famedly/conduit!538
 2023-08-10 17:01:56 +00:00
Timo Kösters
4bf8ee1f74 Merge branch 'nextversion' into 'next' 
Bump version to v0.6.0

See merge request famedly/conduit!537
 2023-08-10 16:58:47 +00:00
Timo Kösters
5d16948030
Bump version to v0.6.0 2023-08-10 18:57:52 +02:00
Timo Kösters
b7b2eb9d05 Merge branch 'trust' into 'next' 
improvement: matrix.org is default trusted server if unspecified

See merge request famedly/conduit!536
 2023-08-10 15:50:16 +00:00
Timo Kösters
19bfee1835
improvement: matrix.org is default trusted server if unspecified 2023-08-10 17:45:58 +02:00
Timo Kösters
9db87550fd Merge branch 'admincommands' into 'next' 
improvement: more forgiving admin command syntax

See merge request famedly/conduit!535
 2023-08-10 15:36:29 +00:00
Timo Kösters
606b25b9e7
improvement: more forgiving admin command syntax 2023-08-10 17:26:55 +02:00
Timo Kösters
fd9e52a559
More sanity checks 2023-08-10 11:45:31 +02:00
Timo Kösters
0a0f227601 Merge branch 'registrationtokens' into 'next' 
Registrationtokens

Closes #372

See merge request famedly/conduit!533
 2023-08-09 20:27:19 +00:00
Timo Kösters
183558150d
fix: don't show removed rooms in space 2023-08-09 22:21:21 +02:00
Timo Kösters
c028e0553c
feat: registration tokens 2023-08-09 18:27:30 +02:00
Timo Kösters
2581f7a10b Merge branch 'fix-broken-links' into 'next' 
Docs: Fix broken links in docker documentation

See merge request famedly/conduit!520
 2023-08-09 07:55:49 +00:00
Timo Kösters
3e518773e2 Merge branch 'improvements' into 'next' 
cross signing fixes

See merge request famedly/conduit!532
 2023-08-07 16:11:11 +00:00
Timo Kösters
888f7e4403 Merge branch 'more-logging-enrichment' into 'next' 
Slightly more logging improvements

See merge request famedly/conduit!530
 2023-08-07 16:04:12 +00:00
Timo Kösters
d82c26f0a9
Avatars for sliding sync DMs 2023-08-07 17:54:08 +02:00
Timo Kösters
c1e2ffc0cd
improvement: maybe cross signing really works now 2023-08-07 13:55:44 +02:00
June
06fccbc340 debug log before and after nofile soft limit increases 
Signed-off-by: June <june@girlboss.ceo>
 2023-08-03 14:51:39 -10:00
girlbossceo
fbd8090b0b log room ID for invalid room topic event errors 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-08-03 08:54:47 -10:00
Timo Kösters
06ab707c79 Merge branch 'rusqlite-update' into 'next' 
bump rusqlite to 0.29.0

See merge request famedly/conduit!529
 2023-08-02 05:06:54 +00:00
Timo Kösters
174a580319 Merge branch 'base64-update' into 'next' 
update base64 to 0.21.2

See merge request famedly/conduit!528
 2023-08-02 05:06:24 +00:00
June
fbb256dd91 bump rusqlite to 0.29.0 
Signed-off-by: June <june@girlboss.ceo>
 2023-08-01 15:09:55 -10:00
June
5a7bade476 update base64 to 0.21.2 
Signed-off-by: June <june@girlboss.ceo>
 2023-08-01 14:48:50 -10:00
Timo Kösters
d2bfcb018e Merge branch 'error-leak-fix' into 'next' 
sanitise potentially sensitive errors

See merge request famedly/conduit!523
 2023-08-01 11:25:06 +00:00
Timo Kösters
08f0f17ff7 Merge branch 'msteenhagen-next-patch-18830' into 'next' 
Removed ambiguity in deploy.md

See merge request famedly/conduit!525
 2023-08-01 11:23:47 +00:00
Timo Kösters
57b86f1130 Merge branch 'msteenhagen-next-patch-22350' into 'next' 
Correct option error adduser in DEPLOY.md

See merge request famedly/conduit!526
 2023-08-01 11:23:28 +00:00
Maarten Steenhagen
3a6eee7019 Correct option error adduser in DEPLOY.md 2023-08-01 11:03:31 +00:00
Maarten Steenhagen
9ce1cad983 Changed 'right' to 'appropriate' to avoid ambiguity (original could be read as right-hand-side) 2023-08-01 10:58:07 +00:00
Timo Kösters
10da9485a5 Merge branch 'threads' into 'next' 
fix: threads get updated properly

See merge request famedly/conduit!524
 2023-07-31 14:24:11 +00:00
Timo Kösters
acfe381dd3
fix: threads get updated properly 
Workaround for element web while waiting for https://github.com/matrix-org/matrix-js-sdk/pull/3635
 2023-07-31 16:18:23 +02:00
girlbossceo
83805c66e5 sanitise potentially sensitive errors 
prevents errors like DB or I/O errors from leaking filesystem paths

Co-authored-by: infamous <ehuff007@gmail.com>
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-30 17:30:16 +00:00
Timo Kösters
afd8112e25 Merge branch 'spaces' into 'next' 
Automatic update checker

See merge request famedly/conduit!522
 2023-07-29 19:55:51 +00:00
Timo Kösters
b8c164dc60
feat: version checker 2023-07-29 21:53:57 +02:00
Timo Kösters
0453a72890 Merge branch 'patch-1' into 'next' 
fix: s/ok_or/ok_or_else in relevant places

See merge request famedly/conduit!521
 2023-07-29 19:19:05 +00:00
girlbossceo
e2c914cc11 fix: s/ok_or/ok_or_else in relevant places 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 19:17:12 +00:00
Timo Kösters
da907451e7
Admin commands to sign and verify jsons 2023-07-29 20:00:12 +02:00
Timo Kösters
2b4a6c96ee Merge branch 'small-logging-improvements' into 'next' 
Slight logging improvements

See merge request famedly/conduit!517
 2023-07-29 15:00:42 +00:00
girlbossceo
d7061e6984 cargo fmt 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:30:48 +00:00
girlbossceo
3494d7759e Return "Hello from Conduit!" on the / route 
akin to Synapes's "It works!" page, removing an unnecessary warning
about / route being unknown

Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:29:26 +00:00
girlbossceo
cc5dcceacc Log the room ID, event ID, PDU, and event type where possible 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:29:26 +00:00
girlbossceo
863103450c Log the unknown login type in warning level 
Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:29:26 +00:00
girlbossceo
a0148a9996 Print relevant room ID and ACL'd server in informational level 
These are room ACLs, not server ACLs. Causes confusion where people
think their Conduit homeserver was ACL'd. Print where these are coming from
in informational level.

Signed-off-by: girlbossceo <june@girlboss.ceo>
 2023-07-29 14:29:26 +00:00