Commit Graph

332 Commits (7c456a0390a5e14d8b758bc8f80c93a7c597f0ea)
 

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
4 years ago
Valkum da28c12eeb Try to add TLS reverse proxy for complement 4 years ago
Valkum 8d66428beb Add intermediate container to hide ARGs
ARGs contain secrets to speed up builds
4 years ago
Valkum 3e03787551 Add Complement dockerfile and move sytest dir 4 years ago
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>
4 years ago
Timo Kösters 698e44a732
Fix /upgrade account data problems 4 years ago
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.
4 years ago
Faelar df55e8ed0b
Add room upgrade. 4 years ago
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
4 years ago
Timo Kösters 3f4cb753ee
improvement: add remaining key backup endpoints 4 years ago
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
4 years ago
Timo 4954df3cc3
feat: handle txn ids 4 years ago
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>
4 years ago
Daniel Wiesenberg 38ac3e42be Docker add healthcheck and mention Docker Hub image 4 years ago
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
4 years ago
Timo 0c1cc8d82b
Fix CI 4 years ago
Timo 33215d6099
fix: send notification count updates when private read receipts change 4 years ago
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
4 years ago
Timo Kösters f0cb17d7a5 Merge branch 'master' into redact 4 years ago
Timo 38663228f5
fix: put reason of redaction in the redacted event 4 years ago
Timo Kösters 8e55623bde Merge pull request 'More Federation' (#181) from docs into master
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/181
4 years ago
Timo 7ba9263cc6
improvement: show most recent PDUs first when searching 4 years ago
Timo 366554630a
fix: account registration 4 years ago
Timo 804d097a18
fix: wake up /sync for typing events 4 years ago
Timo c092f06068
docs: /sync 4 years ago
Timo df936e8e7e
improvement: guests are more spec-conform 4 years ago
Timo 64789537f5
fix: device list when leaving rooms 4 years ago
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
4 years ago
Timo f23fb32e95
fix: set limited to true when skipping messages in /sync 4 years ago
timokoesters e457e19088
feat: search pdus 4 years ago
Timo 27d35f5ab4
docs: fix /register method 4 years ago
Timo 69a7cb5142
fix dependency version 4 years ago
Timo 3ff17f69ad
fmt 4 years ago
Timo 4be68eba76
feat: allow querying conduit's room list over federation 4 years ago
Timo 940f533d61
refactor: avoid some allocations when redacting 4 years ago
Timo 04eee089e0
feat: first steps towards joining rooms over federation 4 years ago
timokoesters f40f1d9f75
docs: endpoint documentation 4 years ago
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>
4 years ago
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.
4 years ago
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>
4 years ago
Faelar 0fef955b28 Fix license. 4 years ago
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>
4 years ago
Jonas Platte 75ea0b3163
Update ruma 4 years ago
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>
4 years ago
Timo 2fc99c05e1
docs: add documentation to the repo and improve layout 4 years ago
Daniel Wiesenberg 87ed132ae4 Add README in docker folder and mention docker in Conduit's README 4 years ago
Daniel Wiesenberg 7288010e55 Move additional files into dedicated folder and make build the def...
...fault in the compose files.
4 years ago
Daniel Wiesenberg 31c725660f Add build option to compose file 4 years ago
Daniel Wiesenberg 7456caeefd Add Element-Web to compose and provide extra compose files for using..
..Conduit behind Traefik Reverse Proxy
4 years ago
Daniel Wiesenberg 5f3cb3f926 Minor modifications to compose file and update Dockerfile comments 4 years ago