Jonas Platte
09895a20c8
Upgrade Ruma
...
Co-authored-by: Timo Kösters <timo@koesters.xyz>
4 years ago
Timo Kösters
47f3263396
Merge branch 'gwmngilfen-next-patch-21674' into 'next'
...
Add two flavours of change for the mautrix-signal patch
See merge request famedly/conduit!197
4 years ago
Greg Sutcliffe
d38f9b5f01
Move Generic instructions for APPSERVICES above notes for specific bridges and tidy up.
4 years ago
Greg Sutcliffe
fa616342b6
Add two flavours of change for the mautrix-signal patch
4 years ago
Timo Kösters
34fa7fee05
Merge branch 'ci-fix-kaniko-i-hope' into 'next'
...
fix(ci): Convince kaniko that it is indeed running in a container by --force-ing it.
See merge request famedly/conduit!205
4 years ago
Jonas Zohren
e8d998cedf
fix(ci): Convince kaniko that it is indeed running in a container by --force-ing it.
4 years ago
Timo Kösters
565fe3a7dd
Merge branch 'faster-sending' into 'next'
...
improvement: batch inserts for inserting pdus
See merge request famedly/conduit!204
4 years ago
Timo Kösters
5c02dc7830
improvement: batch inserts for inserting pdus
4 years ago
Timo Kösters
159e22e450
Merge branch 'ci-fix-aarch64-build' into 'next'
...
fix(ci): Fix aarch64 build
See merge request famedly/conduit!203
4 years ago
Jonas Zohren
ab472e9b7c
fix(ci): Fix aarch64 build
...
gcc-8-aarch64-linux-gnu is not available in debian 11 (which the rust image uses), so update to gcc-10
Signed-off-by: Jonas Zohren <git-pbkyr@jzohren.de>
4 years ago
Timo Kösters
31264e3d1d
Merge branch 'ci-remove-element-web-register-test' into 'next'
...
Remove the "register an account with element" test
See merge request famedly/conduit!202
4 years ago
Jonas Zohren
422bd09e32
Remove the "register an account with element" test
...
Broke due to a timeout and Timo does not like broken tests.
Less testing means less failing tests.
Also, hopefully sytest is less broken now.
4 years ago
Timo Kösters
b64538c6f1
Merge branch 'efficient-sqlite' into 'next'
...
improvement: more efficient sqlite
See merge request famedly/conduit!199
4 years ago
Timo Kösters
178451e9b5
Merge branch 'deduplicate-watchers' into 'next'
...
improvement: deduplicate watchers
See merge request famedly/conduit!201
4 years ago
Timo Kösters
583a966f6e
Merge branch 'less-alloc' into 'next'
...
Reduce allocations in server_server
See merge request famedly/conduit!190
4 years ago
Timo Kösters
cbee7fe111
improvement: deduplicate watchers
4 years ago
Jonas Platte
d68c93b5fa
Clean up (mostly automated with cargo clippy --fix)
4 years ago
Jonas Platte
979ec6b4fa
Upgrade ruma
4 years ago
Jonas Platte
910ad7fed1
Get rid of more unnecessary intermediate collections
4 years ago
Timo Kösters
2c8412fe58
improvement: more efficient sqlite
4 years ago
Timo Kösters
06b0c9267f
Merge branch 'appservice-signal' into 'next'
...
Add mautrix-signal appservice instructions
See merge request famedly/conduit!196
4 years ago
Daniel Wiesenberg
00927a7ce3
Add mautrix-signal appservice instructions
4 years ago
Timo Kösters
4aacafc298
Merge branch 'roomidshort-fix' into 'next'
...
fix sync not firing on new events in room
See merge request famedly/conduit!194
4 years ago
Jonathan de Jong
23c5ec8099
fix sync not firing on new events in room
4 years ago
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
4 years ago
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
4 years ago
Timo Kösters
4a773a1096
Merge branch 'rm-unused-deps' into 'next'
...
Remove unused dependencies
See merge request famedly/conduit!192
4 years ago
Jonas Platte
5821b8e705
Remove unused dependencies
4 years ago
Timo Kösters
0737bc021f
Merge branch 'charludo-next-patch-31617' into 'next'
...
apache2 sample-config error
See merge request famedly/conduit!191
4 years ago
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.
4 years ago
Timo Kösters
2d242523fc
Merge branch 'next' into 'next'
...
Fix deprecated/removed Traefik label
See merge request famedly/conduit!189
4 years ago
Daniel Wiesenberg
bbe36810ec
Fix deprecated/removed Traefik label
4 years ago
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
4 years ago
Timo Kösters
71341ea05a
fix: make sure old events don't sneek into the timeline
4 years ago
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
4 years ago
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>
4 years ago
Timo Kösters
0d6ae2e1e7
Merge branch 'thanks' into 'master'
...
docs: add thanks to
See merge request famedly/conduit!185
4 years ago
Timo Kösters
d0baca44f8
docs: add thanks to
4 years ago
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
4 years ago
Jonas Zohren
3357bbec1e
chore: Also run CI on git tags, not only new commits.
...
Signed-off-by: Jonas Zohren <git-pbkyr@jzohren.de>
4 years ago
Timo Kösters
102ff574ea
Merge branch 'readme' into 'master'
...
docs: update readme and version
See merge request famedly/conduit!180
4 years ago
Timo Kösters
2770ce2cf6
fix: avoid panic
4 years ago
Timo Kösters
7cd7f1923f
chore: update dependencies
4 years ago
Timo Kösters
43d693ca19
revert Arc<EventId> commit
4 years ago
Timo Kösters
875b345a5f
docs: update readme and version
4 years ago
Timo Kösters
17adf096e9
Merge branch 'server-server-opt' into 'master'
...
Remove unneeded intermediary container collection
See merge request famedly/conduit!183
4 years ago
Jonas Platte
487601a249
Remove unneeded intermediary container collection
4 years ago
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
4 years ago
Timo Kösters
4b39d7cb64
fix: batch key fetching
4 years ago
Kurt Roeckx
c53d79e287
fixup! Get required keys in batch when joining a room
4 years ago