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

1051 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonathan de Jong
23c5ec8099 fix sync not firing on new events in room 2021-09-08 14:50:44 +02:00
Timo Kösters
562a2524d7 Merge branch 'db-errors' into 'next' 
fix(database): handle errors in config parsin or database creation

Closes #121

See merge request famedly/conduit!193
 2021-09-08 09:53:25 +00:00
Rasmus Thomsen
51245d34f1
fix(database): handle errors in config parsin or database creation 
Showing the user a backtrace can be pretty confusing, so just printing
a nice error message makes errors easier to understand for end users.

fixes #121
 2021-09-08 09:08:45 +01:00
Timo Kösters
4a773a1096 Merge branch 'rm-unused-deps' into 'next' 
Remove unused dependencies

See merge request famedly/conduit!192
 2021-09-07 14:00:27 +00:00
Jonas Platte
5821b8e705
Remove unused dependencies 2021-09-07 15:41:01 +02:00
Timo Kösters
0737bc021f Merge branch 'charludo-next-patch-31617' into 'next' 
apache2 sample-config error

See merge request famedly/conduit!191
 2021-09-06 18:38:38 +00:00
charludo
487046571c These lines get *generated* by certbot. Having them in the file before running certbot results in an apache2 error, and putting them in afterwards is not necessary, since certbot places them there on its own. 2021-09-06 18:35:35 +00:00
Timo Kösters
2d242523fc Merge branch 'next' into 'next' 
Fix deprecated/removed Traefik label

See merge request famedly/conduit!189
 2021-09-03 20:56:21 +00:00
Daniel Wiesenberg
bbe36810ec Fix deprecated/removed Traefik label 2021-09-03 21:51:17 +02:00
Timo Kösters
a449b1d73f Merge branch 'fix-old-events' into 'next' 
fix: make sure old events don't sneek into the timeline

See merge request famedly/conduit!188
 2021-09-03 09:47:24 +00:00
Timo Kösters
71341ea05a
fix: make sure old events don't sneek into the timeline 2021-09-03 11:26:15 +02:00
Timo Kösters
73b764322f Merge branch 'adjust-ci-for-next-and-master-development' into 'master' 
CI: Adjust CI for master and next branch development model (master)

See merge request famedly/conduit!187
 2021-09-02 18:25:57 +00:00
Jonas Zohren
a1f51440e2 chore(CI): Adjust CI for master and next branch development model 
- Build release builds for branches "master" and "next"
- Push docker images under different tags, depending on why the pipeline started
  - branch master: push to `latest`
  - branch next: push to `next`
  - tag: push to `$TAG_NAME`

Signed-off-by: Jonas Zohren <git-pbkyr@jzohren.de>
 2021-09-02 17:17:51 +02:00
Timo Kösters
0d6ae2e1e7 Merge branch 'thanks' into 'master' 
docs: add thanks to

See merge request famedly/conduit!185
 2021-09-02 11:10:23 +00:00
Timo Kösters
d0baca44f8
docs: add thanks to 2021-09-02 13:05:19 +02:00
Timo Kösters
5536bfdca5 Merge branch 'ci-also-run-for-tags' into 'master' 
Also run CI on git tags, not only new commits.

See merge request famedly/conduit!184
 2021-09-02 07:33:25 +00:00
Jonas Zohren
3357bbec1e chore: Also run CI on git tags, not only new commits. 
Signed-off-by: Jonas Zohren <git-pbkyr@jzohren.de>
 2021-09-02 09:17:25 +02:00
Timo Kösters
102ff574ea Merge branch 'readme' into 'master' 
docs: update readme and version

See merge request famedly/conduit!180
 2021-09-01 21:28:28 +00:00
Timo Kösters
2770ce2cf6
fix: avoid panic 2021-09-01 23:00:24 +02:00
Timo Kösters
7cd7f1923f
chore: update dependencies 2021-09-01 22:31:25 +02:00
Timo Kösters
43d693ca19
revert Arc<EventId> commit 2021-09-01 22:30:11 +02:00
Timo Kösters
875b345a5f
docs: update readme and version 2021-09-01 22:18:19 +02:00
Timo Kösters
17adf096e9 Merge branch 'server-server-opt' into 'master' 
Remove unneeded intermediary container collection

See merge request famedly/conduit!183
 2021-09-01 20:02:37 +00:00
Jonas Platte
487601a249
Remove unneeded intermediary container collection 2021-09-01 21:46:05 +02:00
Timo Kösters
27788af022 Merge branch 'batch_keys' into 'master' 
Get required keys in batch when joining a room

See merge request famedly/conduit!182
 2021-09-01 19:12:21 +00:00
Timo Kösters
4b39d7cb64
fix: batch key fetching 2021-09-01 20:02:34 +02:00
Kurt Roeckx
c53d79e287
fixup! Get required keys in batch when joining a room 2021-09-01 19:30:32 +02:00
Kurt Roeckx
984ad5ecd6
fixup! Get required keys in batch when joining a room 2021-09-01 19:30:31 +02:00
Kurt Roeckx
b546a5bf15
Let our server signing be valid for 1 week 
It was valid for 2 minutes, which can result in the server being
asked too much for something that never changes.
 2021-09-01 19:30:31 +02:00
Kurt Roeckx
a87519fb71
Get required keys in batch when joining a room 
We now ask the trusted server for all keys in 1 request, instead of
asking each server individual for it's own keys.
 2021-09-01 19:30:30 +02:00
Timo Kösters
9c3f1a9272 Merge branch 'master' into 'master' 
Add Traefik setup, incl. step-by-step, to docker README.

See merge request famedly/conduit!158
 2021-09-01 16:04:41 +00:00
Timo Kösters
8518d59a0b Merge branch 'clippy' into 'master' 
Fix a bunch of clippy lints

See merge request famedly/conduit!178
 2021-09-01 10:47:23 +00:00
Timo Kösters
4e68c22457 Merge branch 'docs' into 'master' 
docs: documentation for every endpoint

See merge request famedly/conduit!177
 2021-09-01 10:20:13 +00:00
Timo Kösters
73d876643c
improvement: make pdu cache capacity configurable 2021-09-01 11:03:45 +02:00
Timo Kösters
22779c21d3 Merge branch 'health_script' into 'master' 
Fix healthcheck.sh permissions and rearange ci dockerfile

See merge request famedly/conduit!179
 2021-09-01 08:08:22 +00:00
Daniel Wiesenberg
8c584887c9 Fix healthcheck.sh permissions and rearange ci dockerfile 2021-08-31 23:17:32 +02:00
Timo Kösters
33738dbbc2
improvement: stop prev event fetching if too many events fail 2021-08-31 22:04:47 +02:00
Jonas Platte
a6bb9bbe68
Fix a bunch of clippy lints 2021-08-31 21:20:03 +02:00
Timo Kösters
b9eb39a9c6
docs: documentation for every endpoint 2021-08-31 19:20:34 +02:00
Timo Kösters
364820aae4 Merge branch 'registration-default' into 'master' 
Default registration true

See merge request famedly/conduit!176
 2021-08-31 17:03:05 +00:00
Timo Kösters
ec38411620 Merge branch 'health_script' into 'master' 
Move docker healthcheck into dedicated script.

See merge request famedly/conduit!173
 2021-08-31 16:59:33 +00:00
Jonathan de Jong
9ec8b7f2b3 registration default true 2021-08-31 18:25:35 +02:00
Daniel Wiesenberg
a08ea15695 Use $CI_COMMIT_SHORT_SHA for GIT_REF 
Using `$CI_COMMIT_REF_NAME` means we get `master` for every image build,
which is not very useful/informative. Using `$CI_COMMIT_SHORT_SHA`,
on the other hand, makes it possible to see exactly from which commit an
image was built.
 2021-08-31 18:03:44 +02:00
Timo Kösters
49dd3567c6 Merge branch 'connection-lifetime' into 'master' 
thread_local connections

See merge request famedly/conduit!175
 2021-08-30 19:05:22 +00:00
Jonathan de Jong
69df9a0145 add tls 2021-08-30 20:18:48 +02:00
Timo Kösters
d0d47675d8 Merge branch 'speed' into 'master' 
improvement: call /state_ids less often by using state res

See merge request famedly/conduit!174
 2021-08-30 17:32:41 +00:00
Timo Kösters
bd4ea14a29
improvement: call /state_ids less often by using state res 2021-08-30 16:07:59 +02:00
Timo Kösters
9033cc86aa Merge branch 'speed' into 'master' 
fix: make appservices more efficient

See merge request famedly/conduit!172
 2021-08-30 09:14:08 +00:00
Timo Kösters
1b25e78e3a
fix: inviting dendrite users 2021-08-30 10:56:41 +02:00
Timo Kösters
d57c19802d
improvement: don't do state updates if the event was soft failed 2021-08-30 10:46:36 +02:00