2371 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
mikoto	a888c7cb16	OpenID routes ... Co-Authored-By: Matthias Ahouansou <matthias@ahouansou.cz>	2024-05-28 15:39:19 +01:00
Timo Kösters	47aadcea1d	Merge branch 'membership-reason-fixes' into 'next' ... fix(membership): always set reason & allow new events if reason changed Closes #452 See merge request famedly/conduit!669	2024-05-26 07:22:29 +00:00
Matthias Ahouansou	9b8ec21e6e	Merge branch 'admin-faq' into 'next' ... docs(faq): add instructions on how to make a user admin See merge request famedly/conduit!677	2024-05-14 20:37:21 +00:00
Matthias Ahouansou	e51f60e437	docs(faq): add instructions on how to make a user admin	2024-05-14 21:20:16 +01:00
Matthias Ahouansou	11990e7524	Merge branch 'admin-hash-sign' into 'next' ... feat(admin): add hash-and-sign-event command See merge request famedly/conduit!670	2024-05-09 16:19:40 +00:00
Matthias Ahouansou	3ad7675bbf	Merge branch 'format-toml' into 'next' ... style: format all toml with taplo See merge request famedly/conduit!673	2024-05-06 20:16:13 +00:00
Matthias Ahouansou	e2d91e26d6	style: format all toml with taplo	2024-05-06 20:57:56 +01:00
Matthias Ahouansou	20d9f3fd5d	Merge branch 'media' into 'next' ... fix: make media response match spec See merge request famedly/conduit!672	2024-05-06 18:37:13 +00:00
Timo Kösters	965b6df83d	fix: make media response match spec	2024-05-06 20:05:51 +02:00
Matthias Ahouansou	8876d54d78	feat(admin): add hash-and-sign-event command	2024-05-05 17:35:02 +01:00
Matthias Ahouansou	d8badaf64b	fix(membership): always set reason & allow new events if reason changed	2024-05-05 15:28:18 +01:00
Matthias Ahouansou	08485ea5e4	Merge branch 'bump-rust-nix' into 'next' ... chore: bump rust & nix See merge request famedly/conduit!668	2024-05-05 12:48:36 +00:00
Matthias Ahouansou	eec9b9ed87	chore: bump nix	2024-05-05 13:28:00 +01:00
Matthias Ahouansou	256dae983b	chore: bump rust ... and fix new lints that come with it	2024-05-05 13:27:56 +01:00
Matthias Ahouansou	79c4bb17ca	Merge branch 'build-and-cache-everything' into 'next' ... Draft: build and cache all packages and CI dependencies See merge request famedly/conduit!667	2024-05-05 11:00:12 +00:00
Matthias Ahouansou	57a24f234d	Revert "ci: temporarily disable CONDUIT_VERSION_EXTRA" ... This reverts commit 2a2b9554c8.	2024-05-05 11:43:06 +01:00
Charles Hall	a4c973e57e	build and cache all packages and CI dependencies ... This fixes the problem where some artifacts were not being cached when they should have been. The secret sauce is the `nix-store` command.	2024-05-05 10:35:31 +01:00
Matthias Ahouansou	f9953c31fc	Revert "ci: use sh instead of bash" ... This reverts commit 70b07dfabf.	2024-05-05 09:43:32 +01:00
Matthias Ahouansou	6b669d2f4d	Merge branch 'only-cache-attic-when-nix' into 'next' ... ci: only cache attic when nix is available See merge request famedly/conduit!666	2024-05-05 08:19:15 +00:00
Matthias Ahouansou	90c9794221	Merge branch 'sh-not-bash' into 'next' ... ci: use sh instead of bash See merge request famedly/conduit!665	2024-05-05 08:12:20 +00:00
Matthias Ahouansou	358164f49d	ci: only cache attic when nix is available	2024-05-05 09:01:40 +01:00
Matthias Ahouansou	70b07dfabf	ci: use sh instead of bash	2024-05-05 08:53:53 +01:00
Matthias Ahouansou	d97f5aa3b8	Merge branch 'ci/fastzip' into 'next' ... ci: faster cache and artifact handling See merge request famedly/conduit!664	2024-05-05 05:54:18 +00:00
Matthias Ahouansou	bed9072a69	Merge branch 'always-cache-attic' into 'next' ... ci: prevent unnecessary rebuilds See merge request famedly/conduit!662	2024-05-05 05:54:16 +00:00
Matthias Ahouansou	2a2b9554c8	ci: temporarily disable CONDUIT_VERSION_EXTRA	2024-05-04 21:50:37 +01:00
Matthias Ahouansou	3d9d975a9f	ci: avoid rebuilding bindgen and friends	2024-05-04 15:17:02 +01:00
Charles Hall	96cc1f6abd	only set CONDUIT_VERSION_EXTRA for final build ... This prevents us from needing to recompile the dependencies when that environment variable changes, which generally changes on every commit, which is far more frequently than the dependencies are actually changed.	2024-05-04 13:09:16 +01:00
Charles Hall	55259329a3	make it easy to configure cargo profiles from nix ... This way you can easily build in debug mode with Nix.	2024-05-04 13:09:15 +01:00
Charles Hall	d796fe7cd3	make it easy to configure cargo features from nix ... Users of the nix package can now just use `.override` to choose what features they want. This also makes RocksDB automatically use jemalloc when Conduit is configured to use jemalloc.	2024-05-04 13:09:14 +01:00
Charles Hall	3336d3f812	factor out nix code into new files via makeScope ... This makes the Nix code a lot easier to reason about.	2024-05-04 12:48:49 +01:00
Charles Hall	c9ee4a920e	always go through inputs ... This way we don't have to modify the destructuring of outputs' argument when adding or removing inputs.	2024-05-04 10:03:49 +01:00
Samuel Meenzen	5570f5f3da	ci: faster cache and artifact handling	2024-05-02 15:08:40 +02:00
Matthias Ahouansou	38200163d6	Merge branch 'error-create-remote-user' into 'next' ... fix(admin): don't allow creation of remote users See merge request famedly/conduit!663	2024-05-02 10:39:46 +00:00
Matthias Ahouansou	9db1f5a13c	fix(admin): don't allow creation of remote users	2024-05-02 10:45:04 +01:00
Matthias Ahouansou	0074aca0ef	Merge branch '244-support-well-known' into 'next' ... feat: add .well-known support Closes #244 and #378 See merge request famedly/conduit!332	2024-05-02 09:35:14 +00:00
Matthias Ahouansou	3ecf835b50	ci: cache attic on artifacts job	2024-05-02 09:53:53 +01:00
Matthias Ahouansou	6e913bfec4	docs: delegation	2024-05-02 09:41:27 +01:00
Jakub Kubík	c1f695653b	feat: support hosting .well-known from Conduit ... Co-authored-by: Matthias Ahouansou <matthias@ahouansou.cz>	2024-05-02 09:26:43 +01:00
Matthias Ahouansou	e6b6cc77d1	Merge branch 'verify-x-matrix-destination' into 'next' ... feat(auth): check if X-Matrix destination is correct if present Closes #271 See merge request famedly/conduit!661	2024-05-02 07:15:20 +00:00
Matthias Ahouansou	b69a74961b	Merge branch 'x-matrix-destination-header' into 'next' ... feat(federation): add destination field to X-Matrix header See merge request famedly/conduit!660	2024-05-02 06:59:52 +00:00
Matthias Ahouansou	622aa574b6	Merge branch 'namespace-fixes' into 'next' ... fix(appservices): don't forward events relating to remote users, and forward events relating to remote aliases See merge request famedly/conduit!653	2024-05-02 06:28:01 +00:00
Matthias Ahouansou	63ba157ef6	feat(auth): check if X-Matrix destination is correct if present	2024-05-02 07:14:44 +01:00
Matthias Ahouansou	dfe2916357	feat(federation): add destination field to X-Matrix header	2024-05-02 07:01:04 +01:00
Matthias Ahouansou	b4a60c3f9a	Merge branch 'ci' into 'next' ... ci: use attic.conduit.rs See merge request famedly/conduit!658	2024-05-02 05:56:19 +00:00
Matthias Ahouansou	0b217232ac	ci: push attic to binary cache, update nix script	2024-05-01 21:55:28 +01:00
Timo Kösters	3b7c001350	ci: use attic.conduit.rs	2024-05-01 11:26:12 +02:00
Matthias Ahouansou	10412d4be9	Merge branch 'master' into 'next' ... Pull v0.7.0 tag into next See merge request famedly/conduit!657	2024-04-28 12:28:25 +00:00
Matthias Ahouansou	3c8879771c	Merge branch 'docker-update-request-size' into 'next' ... docs(docker): don't use underscores for max request size Closes #289 See merge request famedly/conduit!656	2024-04-28 11:47:04 +00:00
Matthias Ahouansou	4fac7ca169	Merge branch 'backup-faq-docs' into 'next' ... docs(faq): add backup instructions See merge request famedly/conduit!655	2024-04-28 11:08:22 +00:00
Matthias Ahouansou	a23bfdb3f0	docs(docker): don't use underscores for max request size	2024-04-28 11:48:42 +01:00