1084 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Timo Kösters	dc8bc4a880	Merge branch 'up-ruma' into 'next' ... Upgrade Ruma See merge request famedly/conduit!210	2021-10-15 11:38:12 +00:00
Timo Kösters	87694f4369	Merge branch 'moa31-next-patch-76037' into 'next' ... Change listen address when running inside a Container to prevent Bad Gateway error See merge request famedly/conduit!207	2021-10-15 10:51:19 +00:00
Timo Kösters	335027e739	Merge branch 'nyaaori/admin-check' into 'next' ... Implement admin check and add config option for allowing room creation See merge request famedly/conduit!211	2021-10-15 10:47:55 +00:00
Timo Kösters	0ccda5f1c7	Merge branch 'nyaaori/allow_encryption' into 'next' ... Make allow_encryption work again, fixing #115 Closes #115 See merge request famedly/conduit!212	2021-10-15 10:20:05 +00:00
Nyaaori	9082a531c9	Make allow_encryption work again, fixing #115	2021-10-15 09:57:49 +00:00
Jonas Platte	91afa1e0e0	Make Result alias usable with any error type	2021-10-13 12:25:58 +02:00
Jonas Platte	f2ef5677e0	Reduce turbofish usage ... Should make the code a little bit easier to read.	2021-10-13 12:25:58 +02:00
Jonas Platte	1c4d9af586	Enable more lints and apply their suggestions	2021-10-13 10:24:39 +02:00
Jonas Platte	09895a20c8	Upgrade Ruma ... Co-authored-by: Timo Kösters <timo@koesters.xyz>	2021-10-13 10:16:45 +02:00
Nyaaori	6bc8fb2ae7	Implement admin check and add config option for allowing room creation	2021-09-24 07:16:34 +00:00
Luc-pascal Ceccaldi	5b23d3d06e	Change listen address when running inside a Container to prevent Bad Gateway error	2021-09-23 07:49:52 +00:00
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	2021-09-15 20:31:21 +00:00
Greg Sutcliffe	d38f9b5f01	Move Generic instructions for APPSERVICES above notes for specific bridges and tidy up.	2021-09-15 21:16:25 +01:00
Greg Sutcliffe	fa616342b6	Add two flavours of change for the mautrix-signal patch	2021-09-15 21:16:25 +01:00
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	2021-09-15 07:05:33 +00:00
Jonas Zohren	e8d998cedf	fix(ci): Convince kaniko that it is indeed running in a container by --force-ing it.	2021-09-14 20:44:11 +00:00
Timo Kösters	565fe3a7dd	Merge branch 'faster-sending' into 'next' ... improvement: batch inserts for inserting pdus See merge request famedly/conduit!204	2021-09-14 18:35:12 +00:00
Timo Kösters	5c02dc7830	improvement: batch inserts for inserting pdus	2021-09-14 14:33:46 +02:00
Timo Kösters	159e22e450	Merge branch 'ci-fix-aarch64-build' into 'next' ... fix(ci): Fix aarch64 build See merge request famedly/conduit!203	2021-09-14 12:09:44 +00:00
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>	2021-09-14 12:32:07 +02:00
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	2021-09-14 09:50:24 +00:00
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.	2021-09-14 09:44:15 +00:00
Timo Kösters	b64538c6f1	Merge branch 'efficient-sqlite' into 'next' ... improvement: more efficient sqlite See merge request famedly/conduit!199	2021-09-14 07:23:02 +00:00
Timo Kösters	178451e9b5	Merge branch 'deduplicate-watchers' into 'next' ... improvement: deduplicate watchers See merge request famedly/conduit!201	2021-09-14 07:10:59 +00:00
Timo Kösters	583a966f6e	Merge branch 'less-alloc' into 'next' ... Reduce allocations in server_server See merge request famedly/conduit!190	2021-09-14 07:09:55 +00:00
Timo Kösters	cbee7fe111	improvement: deduplicate watchers	2021-09-13 23:20:30 +02:00
Jonas Platte	d68c93b5fa	Clean up (mostly automated with cargo clippy --fix)	2021-09-13 20:58:58 +02:00
Jonas Platte	979ec6b4fa	Upgrade ruma	2021-09-13 20:55:13 +02:00
Jonas Platte	910ad7fed1	Get rid of more unnecessary intermediate collections	2021-09-13 20:55:12 +02:00
Timo Kösters	2c8412fe58	improvement: more efficient sqlite	2021-09-13 20:12:42 +02:00
Timo Kösters	06b0c9267f	Merge branch 'appservice-signal' into 'next' ... Add mautrix-signal appservice instructions See merge request famedly/conduit!196	2021-09-13 14:07:18 +00:00
Daniel Wiesenberg	00927a7ce3	Add mautrix-signal appservice instructions	2021-09-09 10:02:11 +02:00
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	2021-09-08 13:39:05 +00:00
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