3389 Commits (a544b682983c8d3a0ca6095ddeaa07ba63351932)

 

All Branches   

Search

Author	SHA1	Message	Date
Erik Johnston	4d653748d6	Add note back in	6 years ago
Erik Johnston	8e6c8ba59e	Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls	6 years ago
Erik Johnston	a1aedb386a	Actually use proper sentences like a proper adult	6 years ago
Erik Johnston	0adfd1ebb0	Merge pull request #1591 from matrix-org/erikj/fixup_auth_rules ... Fix up auth rules	6 years ago
Erik Johnston	d63184ebac	Fixup	6 years ago
Erik Johnston	3c53e1910d	Fixup	6 years ago
Erik Johnston	1a45bc4a85	Reword	6 years ago
Erik Johnston	59f86ec8f2	Reindent as RST requires sublists to be three spaces	6 years ago
Erik Johnston	f4706c8889	Require creator field	6 years ago
Erik Johnston	f3aea32a24	Be consistent with 'If..., reject'	6 years ago
Erik Johnston	6c8a45c165	Full stops	6 years ago
Erik Johnston	ebb044674f	Remove duplicated explanation about event rejection	6 years ago
Travis Ralston	4bd23a9086	send_attempt is no longer optional	6 years ago
Travis Ralston	7f719b23e7	Merge pull request #1589 from turt2live/travis/c2s/inhibit-login ... Document the inhibit_login registration option	6 years ago
Travis Ralston	f3181bbedd	Changelog	6 years ago
Travis Ralston	dfaed5b525	Clean up and flesh out all three editions of the /requestToken API ... Fixes https://github.com/matrix-org/matrix-doc/issues/1634 Addresses some of https://github.com/matrix-org/matrix-doc/issues/1396	6 years ago
Travis Ralston	2f55dd66da	Merge pull request #1441 from matrix-org/erikj/state_res_msc ... State Resolution: Reloaded MSC	6 years ago
Travis Ralston	ce14779af1	Merge pull request #1567 from turt2live/travis/c2s/3pid-binding ... Document `validated_at`, `added_at`, and POST /3pid/delete	6 years ago
Travis Ralston	5da3072eef	Wording change ('may not' has a special meaning)	6 years ago
Travis Ralston	4b7f308fc4	Merge pull request #1576 from turt2live/travis/s2s/key-mgmt ... Add federation /user/keys/* endpoints	6 years ago
Travis Ralston	2a08a308f3	device_keys are required	6 years ago
Travis Ralston	caaa688e37	Fix links to client-server spec	6 years ago
Travis Ralston	219b27b182	Merge remote matrix-org/master	6 years ago
Travis Ralston	7516af3df2	Changelog	6 years ago
Travis Ralston	f923d08078	Add read markers ... This is the spec for https://github.com/matrix-org/matrix-doc/issues/910 Fixes https://github.com/matrix-org/matrix-doc/issues/910 Some reverse engineering was required to work out the complete details as to how this works. In particular, the 405 for setting account data and the behaviour of m.read. References: * 405 for account data: d69decd5c7/synapse/rest/client/v2_alpha/account_data.py (L85-L90) * m.read behaviour: d69decd5c7/synapse/rest/client/v2_alpha/read_marker.py (L45-L52)	6 years ago
Richard van der Hoff	492df88024	Merge pull request #1622 from matrix-org/rav/clarify_event_signing ... Rewrite the section on signing events	6 years ago
Richard van der Hoff	0f84c69805	Merge branch 'master' into rav/clarify_event_signing	6 years ago
Travis Ralston	8bcd7d26e3	/3pid/delete returns an empty object	6 years ago
Travis Ralston	390f1c16f7	Remove mentions of identity services from /3pid/delete ... This will be covered by https://github.com/matrix-org/matrix-doc/issues/1194 For now, we can accept that homeservers may try to unbind, however clients should not rely on it.	6 years ago
Travis Ralston	86c85aea71	Merge remote-tracking branch 'matrix-org/master' into travis/c2s/3pid-binding	6 years ago
Travis Ralston	98a445890c	Render a warning if the spec is unstable ... Fixes https://github.com/matrix-org/matrix-doc/issues/1499 This is done by using magic variables in the RST. The magic variables are generated based on the substitutions available, making them available for use at build-time. Magic variables were chosen because it allows people to continue working on the spec and release process without having to worry about removing a chunk of text from the top of the file. Originally, this was attempted by using jinja2 if-statements, however the substitutions are replaced *after* the template is executed, so the condition would never match. The format of the variable is to make the templating happy. Using colons or percent signs results in the templator thinking something else is going on, and then complaining about format.	6 years ago
Travis Ralston	d57b977a55	Merge branch 'm-master' into travis/general/3pid_invite	6 years ago
Travis Ralston	1f6499d563	Fix typo	6 years ago
Travis Ralston	356626845c	Remove unhelpful arrow from the 3rd party invite sequence dance ... This doesn't add anything in terms of clarity.	6 years ago
Travis Ralston	5e6a2c30a2	Comment out the part where identity services can revoke their keys ... They can't because otherwise 3rd party invites can be rejected by homeservers, as per https://github.com/matrix-org/matrix-doc/issues/1633	6 years ago
Travis Ralston	cee0a5ac7b	Merge pull request #1557 from turt2live/travis/general/r0-prep ... Prepare the identity service and server-server APIs for r0	6 years ago
Hubert Chathi	a1b1054aa1	fix handling of multi-line state key descriptions	6 years ago
Travis Ralston	4630c06721	Appservice r0.1.0 changelog	6 years ago
Travis Ralston	951b442956	Merge pull request #1558 from turt2live/travis/c2s/fix-events ... Fix client-server event schemas: move `age`, dedupe fields	6 years ago
Travis Ralston	429f302744	Add an `age` to the invite room state example	6 years ago
Travis Ralston	32cde24bcf	Fix server-server link in IS spec	6 years ago
Travis Ralston	e82c22b060	Merge pull request #1615 from turt2live/travis/is/touchups ... Touch up more of the identity service specification	6 years ago
Travis Ralston	b8f2c721dc	Clarify which attributes should be valid	6 years ago
Travis Ralston	2d18b0d2d8	Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-html-again	6 years ago
Travis Ralston	f09db16027	Merge remote-tracking branch 'matrix-org/master' into travis/s2s/key-mgmt	6 years ago
Travis Ralston	49c5677969	Merge remote-tracking branch 'matrix-org/master' into travis/c2s/user-directory	6 years ago
Travis Ralston	2753d24302	Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep	6 years ago
Travis Ralston	440841d1ff	Recommend a CSP rather than require it.	6 years ago
Travis Ralston	464f4f5f21	Correctly check for the 'core' folder	6 years ago
Travis Ralston	c8a8f13623	Don't check the underlying definitions ... Otherwise the script will try to find a schema for our templates, which don't exist.	6 years ago