char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
332 commits 1 branch 0 tags 2.6 MiB
Commit graph

332 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rudi Floren
7c456a0390 Update dockerignore 
Removing Rocket-example.toml from here is fine,
as it is not included in the last stage of our build stages
 2020-09-17 20:14:07 +02:00
Valkum
da28c12eeb Try to add TLS reverse proxy for complement 2020-09-17 15:36:36 +02:00
Valkum
8d66428beb Add intermediate container to hide ARGs 
ARGs contain secrets to speed up builds
 2020-09-17 12:50:37 +02:00
Valkum
3e03787551 Add Complement dockerfile and move sytest dir 2020-09-16 19:53:27 +02:00
Timo Kösters
b5488f86b5 Merge pull request 'Add room upgrade.' (#182) from q-b/conduit-fork:rooms_upgrade into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/182
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-09-01 13:10:30 +02:00
Timo Kösters
698e44a732
Fix /upgrade account data problems 2020-09-01 13:08:49 +02:00
Timo Kösters
515465f900
fix: make element not show "unknown user" warning 
The 404 error for /profile in the spec says "There is no profile
information for this user or this user does not exist.", but Element
assumes every 404 is a user that does not exist.
 2020-08-31 13:23:39 +02:00
Faelar
df55e8ed0b
Add room upgrade. 2020-08-31 12:01:41 +02:00
Timo Kösters
aef0c8563c Merge pull request 'improvement: add remaining key backup endpoints' (#201) from keybackup into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/201
 2020-08-31 11:24:11 +02:00
Timo Kösters
3f4cb753ee
improvement: add remaining key backup endpoints 2020-08-27 14:52:20 +02:00
Timo Kösters
d15b8d7c4e Merge pull request 'feat: handle txn ids' (#198) from txnids into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/198
 2020-08-25 21:35:24 +02:00
Timo
4954df3cc3
feat: handle txn ids 2020-08-25 21:33:44 +02:00
Timo Kösters
6343eea417 Merge pull request 'Docker add healthcheck and mention Docker Hub image' (#196) from Weasy666/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/196
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-25 09:40:08 +02:00
Daniel Wiesenberg
38ac3e42be Docker add healthcheck and mention Docker Hub image 2020-08-25 09:02:45 +02:00
Timo Kösters
0f524955b2 Merge pull request 'fix: send notification count updates when private read receipts change' (#194) from fixrr into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/194
 2020-08-24 13:39:39 +02:00
Timo
0c1cc8d82b
Fix CI 2020-08-24 11:31:19 +02:00
Timo
33215d6099
fix: send notification count updates when private read receipts change 2020-08-24 10:46:20 +02:00
Timo Kösters
9aa5e99a0f Merge pull request 'fix: put reason of redaction in the redacted event' (#193) from redact into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/193
 2020-08-24 10:43:05 +02:00
Timo Kösters
f0cb17d7a5 Merge branch 'master' into redact 2020-08-24 10:42:00 +02:00
Timo
38663228f5
fix: put reason of redaction in the redacted event 2020-08-23 16:47:27 +02:00
Timo Kösters
8e55623bde Merge pull request 'More Federation' (#181) from docs into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/181
 2020-08-23 16:15:01 +02:00
Timo
7ba9263cc6
improvement: show most recent PDUs first when searching 2020-08-23 16:14:11 +02:00
Timo
366554630a
fix: account registration 2020-08-23 16:14:11 +02:00
Timo
804d097a18
fix: wake up /sync for typing events 2020-08-23 16:14:10 +02:00
Timo
c092f06068
docs: /sync 2020-08-23 16:14:10 +02:00
Timo
df936e8e7e
improvement: guests are more spec-conform 2020-08-23 16:14:10 +02:00
Timo
64789537f5
fix: device list when leaving rooms 2020-08-23 16:14:09 +02:00
Timo
4323cf5fec
improvement: device list works better 
The only situation that isn't working yet is sending `left` events for
users when the sender leaves the room
 2020-08-23 16:14:09 +02:00
Timo
f23fb32e95
fix: set limited to true when skipping messages in /sync 2020-08-23 16:14:09 +02:00
timokoesters
e457e19088
feat: search pdus 2020-08-23 16:14:08 +02:00
Timo
27d35f5ab4
docs: fix /register method 2020-08-23 16:14:08 +02:00
Timo
69a7cb5142
fix dependency version 2020-08-23 16:14:07 +02:00
Timo
3ff17f69ad
fmt 2020-08-23 16:14:07 +02:00
Timo
4be68eba76
feat: allow querying conduit's room list over federation 2020-08-23 16:14:07 +02:00
Timo
940f533d61
refactor: avoid some allocations when redacting 2020-08-23 16:14:06 +02:00
Timo
04eee089e0
feat: first steps towards joining rooms over federation 2020-08-23 16:14:06 +02:00
timokoesters
f40f1d9f75
docs: endpoint documentation 2020-08-23 16:14:06 +02:00
Timo Kösters
cfda76860b Merge pull request 'Make default server name more obvious' (#192) from spaetz/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/192
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-18 20:51:15 +02:00
Sebastian Spaeth
6b7e92ccf5 Make default server name more obvious 
Too many people fell into the trap and left conduit.rs in the deployment
configuration, wondering why users are all listed as @conduit.rs.

Make the default server name really easy to identify and make it obvious
that this needs to be changed.
 2020-08-18 19:18:10 +02:00
Timo Kösters
6191c3bd00 Merge pull request 'Fix license.' (#190) from q-b/conduit-fork:license into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/190
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-17 14:13:19 +02:00
Faelar
0fef955b28 Fix license. 2020-08-17 13:59:35 +02:00
Timo Kösters
2d96323d5f Merge pull request 'Update ruma' (#184) from jplatte/conduit:up-ruma into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/184
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-13 09:04:22 +02:00
Jonas Platte
75ea0b3163
Update ruma 2020-08-12 23:42:17 +02:00
Timo Kösters
4b3d6e736f Merge pull request 'Alpine based Docker image' (#152) from Weasy666/conduit:master into master 
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/152
Reviewed-by: Timo Kösters <timo@koesters.xyz>
 2020-08-12 21:42:58 +02:00
Timo
2fc99c05e1
docs: add documentation to the repo and improve layout 2020-08-12 21:17:53 +02:00
Daniel Wiesenberg
87ed132ae4 Add README in docker folder and mention docker in Conduit's README 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
7288010e55 Move additional files into dedicated folder and make build the def... 
...fault in the compose files.
 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
31c725660f Add build option to compose file 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
7456caeefd Add Element-Web to compose and provide extra compose files for using.. 
..Conduit behind Traefik Reverse Proxy
 2020-08-11 15:38:24 +02:00
Daniel Wiesenberg
5f3cb3f926 Minor modifications to compose file and update Dockerfile comments 2020-08-11 15:38:24 +02:00