4263 Commits (a514485bcb733fb58847872a2ed81723c015b224)

 

All Branches   

Search

Author	SHA1	Message	Date
Hubert Chathi	a514485bcb	add note about displaying other events	5 years ago
Hubert Chathi	f4bad37c10	add notes about redactions/edits	5 years ago
Hubert Chathi	7466955744	add note that verifying yourself may want to use to_device instead	5 years ago
Hubert Chathi	788e98711e	Merge branch 'e2e_verification_in_dms' of github.com:uhoreg/matrix-doc into e2e_verification_in_dms	5 years ago
Hubert Chathi	1d165eec29	add clarifications	5 years ago
Hubert Chathi	06ee66d6b0	Apply suggestions from code review ... Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net> Co-Authored-By: David Baker <dbkr@users.noreply.github.com>	5 years ago
Hubert Chathi	1f1d22f667	fix a couple of missed m.reference changes	5 years ago
Hubert Chathi	ab3ed738e4	drop the recommendation that requests highlight the user	5 years ago
Hubert Chathi	7469198d8b	add from_device fields and a FIXME	5 years ago
Hubert Chathi	e19fca7d54	make some fixes, add a clarification, add a message to indicate completion	5 years ago
Hubert Chathi	0007498b4c	remove empty tradeoffs section	5 years ago
Hubert Chathi	0e6286f5d0	write more stuff	5 years ago
Hubert Chathi	fb724bc625	rename to match PR number	5 years ago
Hubert Chathi	4f655247b0	initial draft of verification in DMs	5 years ago
Travis Ralston	2a2dddab94	Merge pull request #2151 from reivilibre/push_id_event_id ... Fix Push Gateway API example: Field renamed to event_id	5 years ago
Travis Ralston	bf9f2cd1b6	Merge pull request #2183 from lucavb/master ... Spec clarification regarding authorisation rules in v1	5 years ago
Luca Becker	f4d6b6c261	Fixed broken indentations	5 years ago
Luca Becker	c7a23557d4	Last cosmetic changes ... switched back to the use of `.. NOTE::`	5 years ago
Luca Becker	d43111cdd2	Incorporated @turt2live suggestions. ... Used **Note** to describe notes around the authorisation rules. Otherwise restored the original state for the consequences from the auth rules. Moved the clarification regarding default power levels up above the auth rules. Removed third sentence. And followed @turt2live's example, but opted for "for users in that room" because the default user power level is applied to all users.	5 years ago
Luca Becker	094005dca1	Incorporated @turt2live suggestions. ... Added missing added and removed to the rule, because these keys are not required for m.room.power_levels. Also moved the note down to the Note section.	5 years ago
Luca Becker	8aece4f644	Incorporated @richvdh suggestions	5 years ago
Luca Becker	15994c61a5	Clarification regarding authorisation rules ... The rules for m.room.power_levels power were somewhat unclear regarding the behaviour towards the always present keys, such as kick and ban. Additionally, it is now also clarified that in the users and events dictionary also added and removed keys are taken into consideration.	5 years ago
Travis Ralston	7b0f5ea77b	Merge pull request #2159 from jimmycuadra/reference-hash-purpose ... Clarify the purpose of reference hashes.	5 years ago
Jimmy Cuadra	a3d2d14dae	Rephrase explanation of the purpose of reference hashes and link to the ... room version spec. Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>	5 years ago
Andrew Morgan	52643a92c6	Less confusing wording on Application Service's Legacy Routes (#2160) ... https://matrix.org/docs/spec/application_service/r0.1.1#legacy-routes The "becomes" wording made it a little bit confusing for which was the new route and which was the old.	5 years ago
Jimmy Cuadra	5df86dabe0	Clarify the purpose of reference hashes. ... The server-server specification describes a "reference hash" of an event and how to calculate it, but is otherwise not mentioned anywhere else in the document. This change adds a sentence to explain that they are used for event identifiers in later room versions, which are described in other documents. Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>	5 years ago
Hubert Chathi	ee04b778cf	Merge pull request #2157 from a-andreyev/aa13q/api-client-server-device-keys ... Client-server: Fix upload keys example request	5 years ago
Alexey Andreyev	9ed19a37ad	Client-server: Fix upload keys example request ... Contributes to #1733 Signed-off-by: Alexey Andreyev <aa13q@ya.ru>	5 years ago
Travis Ralston	db5ce0c69e	Merge pull request #2152 from matrix-org/jryans/room-one-to-one-push-rule ... Clarify `.m.rule.room_one_to_one` push rule	5 years ago
J. Ryan Stinnett	9208c5cd13	Add changelog	5 years ago
J. Ryan Stinnett	4c65660b96	Clarify `.m.rule.room_one_to_one` push rule ... This clarifies the `.m.rule.room_one_to_one` push rule by adding a condition on event type. Some parts of the spec already had this info, while others were missing it. Synapse has had this behaviour since the push rule appeared. Fixes https://github.com/matrix-org/matrix-doc/issues/2150	5 years ago
reivilibre	8033ab1c86	Fix Push Gateway API example: Field renamed to event_id ... I believe this was forgotten in: 71cb646541	5 years ago
Travis Ralston	ad5d46d331	Merge pull request #2148 from matrix-org/anoa/typooo ... Fix a small typo	5 years ago
Andrew Morgan	e88a074c9f	Add changelog	5 years ago
Andrew Morgan	4997abc4b7	as as -> as	5 years ago
Travis Ralston	ace94f02b7	Merge pull request #2132 from jimmycuadra/clarify-m.key.verification.start ... Clarify the distinction between *m.key.verification.start* and its *m.sas.v1* variant.	5 years ago
Jimmy Cuadra	8246383330	Fix typos in changelog entry.	5 years ago
Travis Ralston	204601d9a4	Merge pull request #2133 from matrix-org/travis/fix-olm-2 ... Fix link to Olm signing specification	5 years ago
Travis Ralston	ffdd8dfe01	Merge pull request #2137 from matrix-org/identity_service/release-r0.2.1 ... Identity r0.2.1	5 years ago
Travis Ralston	d09af5b191	Identity r0.2.1	5 years ago
Travis Ralston	954a5607c3	Merge pull request #2136 from ma1uta/master ... Fix typo.	5 years ago
Travis Ralston	c63b5aff69	Create 2136.clarification	5 years ago
Anatoly Sablin	802b90d113	Typo.	5 years ago
Jimmy Cuadra	8affb23e5e	Address feedback from code review. ... * Switch "an SAS" back to "a SAS" * Remove the `next_method` field from m.key.verification.start$m.sas.v1 but add additional clarification to its description on m.key.verification.start that it is never present for methods that verify keys both ways.	6 years ago
Travis Ralston	6f460ad70a	minus spec ... according to the apache .htaccess we use	6 years ago
Travis Ralston	33ca891e71	Fix link to Olm signing specification ... See https://github.com/matrix-org/matrix.org/issues/478	6 years ago
Jimmy Cuadra	5384b61d95	Fix style issues brought up during code review. ... Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>	6 years ago
Jimmy Cuadra	bc71dacaf4	Clarify the distinction between *m.key.verification.start* and its *m.sas.v1* variant. ... Currently the *m.key.verification.start* event appears twice with the exact same title, in the "Key verification framework" section and the "Short Authentication (SAS) verification" section. It's not immediately clear that the first occurrence describes the format of the event in general terms and that the second occurrence describes the fields when the *m.sas.v1* verification method is being used. This is a similar relationship to the *m.room.message* event and its various *msgtype* variants. This commit does three things: * It tweaks the generation of the documentation to change the title of the second occurrence of *m.key.verification.start* to distinguish it from the first. * It updates the language in the description of the two versions of the event to better describe the relationship between the two. * It adds the optional `next_method` field to the schema of the *m.sas.v1* variant, as specified in the general form of *m.key.verification.start*. Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>	6 years ago
Travis Ralston	b807e1cbe5	Merge pull request #2129 from jimmycuadra/conditionally-required-url-fields ... Remove the "required" designation from the `url` field of certain m.room.message msgtypes.	6 years ago
Matthew Hodgson	aadf1cc733	Merge pull request #2131 from jimmycuadra/e2ee-easier-typo ... Fix typo in key verification framework section.	6 years ago