651 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Paul van Tilburg	5bf43a4d7e	Generate conduit.toml instead of debian environment file ... Only generate this file once. I am not sure what to do with future upgrades yet.	2021-04-22 21:52:40 +02:00
Paul van Tilburg	ab58609d3d	No longer use/support a local environment file	2021-04-16 22:07:58 +02:00
Timo Kösters	6d109b9902	Merge branch 'mdformatting' into 'master' ... docs: Fix markdown formatting in DEPLOY.md See merge request famedly/conduit!58	2021-04-16 09:24:52 +00:00
Tobias Fella	95db30918e	docs: Fix fix formatting of code blocks in markdown	2021-04-16 11:10:01 +02:00
Timo Kösters	18398e1f17	Merge branch 'bump-stateres' into 'master' ... Bump stateres See merge request famedly/conduit!57	2021-04-14 15:47:00 +00:00
Timo Kösters	04b08d4505	chore: bump stateres	2021-04-14 17:46:17 +02:00
Timo Kösters	f6c4da829e	Merge branch 'better-joining' into 'master' ... improvement: use invite state as hints to what servers to ask for joining See merge request famedly/conduit!56	2021-04-14 13:06:14 +00:00
Timo Kösters	bc98425dfe	improvement: use invite state as hints to what servers to ask for joining	2021-04-14 14:46:40 +02:00
Timo Kösters	d6b59cd20c	Merge branch 'develop' into 'master' ... State resolution overhaul See merge request famedly/conduit!53	2021-04-14 11:36:53 +00:00
Timo Kösters	001d8dc257	fix: don't do expensive operation on local /send	2021-04-14 12:55:14 +02:00
Timo Kösters	c1953efa6b	chore: code cleanup	2021-04-14 10:43:31 +02:00
Timo Kösters	abddfc2d2a	Merge remote-tracking branch 'famedly/master' into develop	2021-04-14 10:26:28 +02:00
Timo Kösters	5951294638	feat: join cursed rooms ... this removes several restrictions and tries to continue verifying a pdu event if some auth events fail (it drops/ignores bad pdus)	2021-04-14 09:39:06 +02:00
Timo Kösters	8b40e0a85f	improvement: fetch signing keys in parallel when joining a room	2021-04-13 22:54:01 +02:00
Timo Kösters	5049d0e01b	improvement: check signatures on join	2021-04-13 18:17:51 +02:00
Timo Kösters	b4f79b77ba	feat: reject invites over federation	2021-04-13 17:41:14 +02:00
Timo Kösters	662a0cf1df	improvement: better and more efficient message count calculation	2021-04-12 12:40:16 +02:00
Timo Kösters	1dc85895a7	fix: show warning for invalid user ids	2021-04-12 10:12:52 +02:00
Timo Kösters	a961732f5f	fix: overflow	2021-04-11 21:35:17 +02:00
Timo Kösters	a8231eef25	fix: alias parsing	2021-04-11 21:29:37 +02:00
Timo Kösters	8773e5013d	feat: incoming invites over federation	2021-04-11 21:04:31 +02:00
Timo Kösters	b427395648	Merge branch 'add-vscode-settings' into 'master' ... Add settings.json for vscode rust-analyzer See merge request famedly/conduit!45	2021-04-11 10:56:38 +00:00
Timo Kösters	b4bbbd26bf	Merge branch 'MTRNord/propose-better-systemd-user' into 'master' ... fix: Do not run conduit as root instead use a separate user See merge request famedly/conduit!49	2021-04-11 10:52:52 +00:00
Marcel	ac99e05714	docs: capitalize a "conduit" that was missed	2021-04-11 10:51:43 +00:00
Marcel	dd69850598	docs: Fix missing _matrix in apache config	2021-04-11 10:50:38 +00:00
Timo Kösters	b0ea692706	fix: malformed pushrule error when event does not trigger any actions	2021-04-11 10:50:30 +02:00
Timo Kösters	588de12d79	fix: lost forward extremity	2021-04-11 10:12:29 +02:00
Timo Kösters	044e65afcc	fix: move back to sled stable	2021-04-11 10:12:05 +02:00
Timo Kösters	84f4ce73e5	fix: membership deserializing	2021-04-09 21:45:22 +02:00
Timo Kösters	51aa6448bc	fix: use sled main to avoid deadlock	2021-04-07 17:58:33 +02:00
Timo Kösters	f3f95a73d0	improvement: /event route	2021-04-07 15:57:23 +02:00
Timo Kösters	d0cdbe2e2b	Merge branch 'up-ruma' into 'develop' ... Upgrade ruma See merge request famedly/conduit!48	2021-04-07 13:55:31 +00:00
Jonas Platte	dc031fff95	Remove redundant calls to .iter() and .into_iter()	2021-04-06 17:38:54 +02:00
Jonas Platte	dbe8c2ce19	Remove lots of redundant string allocations	2021-04-06 17:38:54 +02:00
Jonas Platte	fe744c856f	Upgrade ruma ... … and refactor push rule code along the way.	2021-04-06 17:38:53 +02:00
Marcel	c267c0f09e	fix: use full codeblocks and capitalize Conduit and Debian	2021-04-06 13:17:39 +00:00
Marcel	9b2f8730bb	fix: Do not run conduit as root instead use a separate user	2021-04-06 12:26:47 +00:00
Timo Kösters	c9b1f0ca83	Merge branch 'k0gen-master-patch-33282' into 'master' ... No need to log out and back in fix See merge request famedly/conduit!47	2021-04-03 13:04:55 +00:00
Mariusz Kogen	246e4735fd	No need to log out and back in fix	2021-04-02 22:11:14 +00:00
Timo Kösters	db7044a950	sytest test	2021-03-26 13:41:05 +01:00
Timo Kösters	8c6a49bec3	Merge branch 'update_CI_for_develop' into 'develop' ... Update Complement CI container See merge request famedly/conduit!46	2021-03-26 12:31:34 +00:00
Timo Kösters	cd4dc13731	fix: use correct room versions	2021-03-26 13:30:17 +01:00
Rudi Floren	5a13f6f7e0	Remove build container and use the always present build artifact directly ... Proper chmod caddy and conduit binaries	2021-03-26 04:19:54 +01:00
Timo Kösters	c213769d9f	improvement: refactor state res and fix a few bugs in the process	2021-03-25 23:55:40 +01:00
Timo Kösters	16eed1d8c2	chore: get rid of warnings	2021-03-24 12:44:10 +01:00
Timo Kösters	e50f2864de	improvement: save state for send_join pdu	2021-03-24 11:46:15 +01:00
Timo Kösters	e305889b72	feat: room_account_data endpoints	2021-03-24 08:48:28 +01:00
Timo Kösters	1d00a8c41f	improvement: better logging ... Use CONDUIT_LOG or the log setting in the config	2021-03-23 22:06:09 +01:00
Timo Kösters	46d8f36a2c	fix: media thumbnail calculation and appservice detection	2021-03-23 21:18:16 +01:00
Timo Kösters	3ea7d162db	fix: various improvements and fixes	2021-03-23 12:59:27 +01:00