4755 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	f59aa563dd	Add missing tags to push rules endpoints ... Without the tags, the endpoints don't end up in the swagger. No changelog for this because it doesn't affect the spec itself.	2020-01-01 11:59:37 -07:00
Travis Ralston	224a103355	Merge pull request #2392 from matrix-org/travis/s2s/fix-auth ... Move auth events selection to a more appropriate section of the spec	2019-12-31 15:47:13 -07:00
Travis Ralston	912b3cbc95	Move auth events selection to a more appropriate section of the spec ... This was pretty buried, and feels like a common question.	2019-12-30 16:29:56 -07:00
Travis Ralston	f11f77f33b	Merge pull request #2386 from carbeer/patch-1 ... Change state_type to event_type	2019-12-15 15:31:08 -07:00
Carolin Beer	3aba6e3eeb	Change state_type to event_type ... I couldn't find any other reference to a state_type within the entire specification. I assume this is supposed to be the event_type? This aligns with the description of changes resulting from a state update.	2019-12-15 14:37:10 +01:00
Travis Ralston	c823bdbf70	Merge pull request #2384 from matrix-org/travis/pr-templates ... Add some github stuff (PR templates, funding)	2019-12-09 09:14:00 -07:00
Travis Ralston	47b94b62c4	Add some github stuff (PR templates, funding)	2019-12-07 15:57:24 -07:00
Travis Ralston	21b50d749a	Merge pull request #2369 from iinuwa/token-auth-doc-tweaks ... Rename nonce to txn_id. Reorganize for clarity.	2019-12-07 15:37:10 -07:00
Travis Ralston	ccc7bcabbc	id -> ID while we're here	2019-12-07 15:32:43 -07:00
Travis Ralston	7cfc4b09a6	Changelog	2019-12-07 15:31:42 -07:00
Travis Ralston	b556ef3605	Merge pull request #2381 from Cadair/patch-1 ... Clarify description of user directory	2019-12-07 15:14:37 -07:00
Travis Ralston	4d0bd5b9e2	Changelog	2019-12-07 15:12:55 -07:00
Stuart Mumford	c2ffef051f	Clarify description of user directory ... Signed off by Stuart Mumford <stuart@cadair.com>	2019-12-05 09:27:37 -07:00
Hubert Chathi	d7263861d8	Merge pull request #2371 from uhoreg/add_unstable_prefix_template ... add unstable prefix section to proposal template	2019-12-03 14:37:49 -05:00
Travis Ralston	1cf322bc2a	MSC2324: Facilitating early releases of software dependent on spec (#2324)	2019-12-03 18:43:56 +00:00
Hubert Chathi	75a6a28c6c	Merge pull request #2372 from matrix-org/jryans/clarify-cross-signing-examples ... Clarify cross-signing examples	2019-12-02 16:30:01 -05:00
Travis Ralston	e4deb4ca27	Merge pull request #2367 from matrix-org/erikj/invite_reject_reasons ... MSC2367: Add reason field to all membership events	2019-12-02 08:12:13 -07:00
J. Ryan Stinnett	71faffc9ed	Update example to show keys wrapped by user ID	2019-12-02 14:59:48 +00:00
J. Ryan Stinnett	c549bf201b	Clarify POST instead of GET for federation key query	2019-12-02 14:54:59 +00:00
Hubert Chathi	b7234c7fd3	add unstable prefix section to proposal template	2019-11-29 15:51:50 -05:00
Isaiah Inuwa	ad383351c2	Rename nonce to txn_id. Reorganize for clarity. ... Signed-Off-By: Isaiah Inuwa <isaiah.inuwa@gmail.com>	2019-11-29 10:25:38 -06:00
Travis Ralston	f37aa30c43	Merge pull request #1756 from uhoreg/cross-signing2 ... MSC1756: cross-signing devices using a master identity key	2019-11-26 10:00:44 -07:00
Erik Johnston	f054ffe760	Add note about using PUT /state/m.room.member/	2019-11-26 11:40:38 +00:00
Erik Johnston	29745d04fb	erikj/msc_membership_reasons	2019-11-26 11:22:42 +00:00
Travis Ralston	2a82a5c27c	Merge pull request #2313 from matrix-org/msc2313 ... MSC2313: Moderation policies as rooms (ban lists)	2019-11-25 09:17:33 -07:00
Hubert Chathi	82260689c9	add link to migrating from device verifications	2019-11-20 11:55:10 -05:00
Hubert Chathi	3b2f897c7e	Apply suggestions from code review ... Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>	2019-11-20 11:48:36 -05:00
Travis Ralston	c7b3d99853	m.policy.rule won the debate	2019-11-19 11:53:07 -07:00
Travis Ralston	f1ff31d2cb	Merge pull request #2284 from matrix-org/travis/msc/optional-is-discover ... MSC2284: Making the identity server optional during discovery	2019-11-18 10:15:48 -07:00
Travis Ralston	f610235cd6	Rename the MSC to be better targeted	2019-11-18 09:38:17 -07:00
Travis Ralston	e89d81c587	Merge pull request #2351 from MurzNN/patch-2 ... Typo: later user » later use	2019-11-13 10:37:41 -07:00
Travis Ralston	d93d8fe9b5	Add a changelog	2019-11-13 10:36:41 -07:00
Travis Ralston	605f3390c7	Merge pull request #1946 from uhoreg/ssss ... MSC1946: Secure Secret Storage and Sharing	2019-11-13 10:07:05 -07:00
Travis Ralston	037894d6f7	Merge pull request #2244 from tulir/mass_redactions ... MSC2244: Mass redactions	2019-11-12 08:56:38 -07:00
Hubert Chathi	fc793557f8	make the default key event an object	2019-11-12 10:48:38 -05:00
Alexey Murz Korepov	daa610659b	Typo: later user » later use	2019-11-10 16:45:01 +03:00
Travis Ralston	dcbdb94693	Add explanation	2019-11-08 09:03:49 -07:00
Hubert Chathi	e8ce135a41	add clarification and examples	2019-11-07 19:01:30 -05:00
Hubert Chathi	5cc5908dd5	Update proposals/1946-secure_server-side_storage.md ... Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>	2019-11-07 18:45:29 -05:00
Travis Ralston	11a7d799a3	Merge pull request #2349 from matrix-org/identity_service/release-r0.3.0 ... Identity Service r0.3.0 release	2019-11-07 08:52:41 -07:00
Travis Ralston	96bc8354d5	Merge pull request #2350 from matrix-org/client_server/release-r0.6.0 ... Client Server r0.6.0 release	2019-11-07 08:52:35 -07:00
Travis Ralston	5b6d6fe498	Update changelogs/client_server.rst ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2019-11-07 08:49:59 -07:00
Travis Ralston	7351c0cd1e	Add missing versions to identity spec	2019-11-06 12:47:09 -07:00
Travis Ralston	50647e646e	Add r0.6.0 to the list of spec versions.	2019-11-06 12:44:41 -07:00
Travis Ralston	f361c756d2	Client Server r0.6.0 release	2019-11-06 12:43:13 -07:00
Travis Ralston	df202dd493	Identity Service r0.3.0 release	2019-11-06 12:37:50 -07:00
Travis Ralston	14d609e766	Merge pull request #2344 from matrix-org/travis/spec/fix-2338 ... Add filter query param to /context	2019-11-06 10:53:21 -07:00
Travis Ralston	9f01850f7a	Add some words about where the filter is applied	2019-11-06 10:43:11 -07:00
Travis Ralston	a1e5a96cf8	Update api/client-server/event_context.yaml ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-11-06 10:42:08 -07:00
Travis Ralston	8e6e47ae7d	Merge pull request #2343 from matrix-org/travis/spec/fix-2120 ... Recommend that clients don't preview URLs in encrypted rooms	2019-11-06 09:50:36 -07:00