Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-11 10:03:43 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4266 commits 28 branches 42 tags 32 MiB
Commit graph

4266 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hubert Chathi 4a779784ef
Update proposals/2241-e2e-verification-in-dms.md 
Co-authored-by: poljar <poljar@termina.org.uk>
 2020-12-06 09:43:53 -05:00
Hubert Chathi 91f51bb23e use .ready to accept a verification, plus some clarification 2020-04-15 16:09:36 -04:00
Hubert Chathi 1590ae224c make hash commitment always include the m.relates_to 2019-11-18 16:24:59 -05:00
Hubert Chathi a514485bcb add note about displaying other events 2019-11-05 16:22:45 -05:00
Hubert Chathi f4bad37c10 add notes about redactions/edits 2019-11-05 16:20:41 -05:00
Hubert Chathi 7466955744 add note that verifying yourself may want to use to_device instead 2019-11-01 14:54:58 -04:00
Hubert Chathi 788e98711e Merge branch 'e2e_verification_in_dms' of github.com:uhoreg/matrix-doc into e2e_verification_in_dms 2019-10-23 13:24:18 -04:00
Hubert Chathi 1d165eec29 add clarifications 2019-10-23 13:22:10 -04:00
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>
 2019-10-23 15:30:07 +01:00
Hubert Chathi 1f1d22f667 fix a couple of missed m.reference changes 2019-10-08 16:46:15 -04:00
Hubert Chathi ab3ed738e4 drop the recommendation that requests highlight the user 2019-10-08 16:27:53 -04:00
Hubert Chathi 7469198d8b add from_device fields and a FIXME 2019-10-08 16:19:39 -04:00
Hubert Chathi e19fca7d54 make some fixes, add a clarification, add a message to indicate completion 2019-09-25 15:31:01 -04:00
Hubert Chathi 0007498b4c remove empty tradeoffs section 2019-09-05 11:54:33 -04:00
Hubert Chathi 0e6286f5d0 write more stuff 2019-08-24 12:38:13 -07:00
Hubert Chathi fb724bc625 rename to match PR number 2019-08-21 21:22:03 -07:00
Hubert Chathi 4f655247b0 initial draft of verification in DMs 2019-08-21 21:17:41 -07:00
Travis Ralston 2a2dddab94
Merge pull request #2151 from reivilibre/push_id_event_id 
Fix Push Gateway API example: Field renamed to event_id
 2019-07-25 10:31:13 -06:00
Travis Ralston bf9f2cd1b6
Merge pull request #2183 from lucavb/master 
Spec clarification regarding authorisation rules in v1
 2019-07-23 12:04:27 -06:00
Luca Becker f4d6b6c261
Fixed broken indentations 2019-07-23 17:58:40 +02:00
Luca Becker c7a23557d4
Last cosmetic changes 
switched back to the use of `.. NOTE::`
 2019-07-23 17:57:22 +02:00
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.
 2019-07-23 11:25:34 +02:00
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.
 2019-07-18 08:55:58 +02:00
Luca Becker 8aece4f644
Incorporated @richvdh suggestions 2019-07-17 23:26:10 +02:00
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.
 2019-07-16 17:33:13 +02:00
Travis Ralston 7b0f5ea77b
Merge pull request #2159 from jimmycuadra/reference-hash-purpose 
Clarify the purpose of reference hashes.
 2019-07-09 16:27:44 -06:00
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>
 2019-07-09 15:26:03 -07:00
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.
 2019-07-09 17:54:45 +01:00
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>
 2019-07-09 01:14:29 -07:00
Hubert Chathi ee04b778cf
Merge pull request #2157 from a-andreyev/aa13q/api-client-server-device-keys 
Client-server: Fix upload keys example request
 2019-07-08 15:57:56 -04:00
Alexey Andreyev 9ed19a37ad
Client-server: Fix upload keys example request 
Contributes to #1733

Signed-off-by: Alexey Andreyev <aa13q@ya.ru>
 2019-07-08 22:28:32 +03:00
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
 2019-07-03 09:35:12 -06:00
J. Ryan Stinnett 9208c5cd13 Add changelog 2019-07-03 11:34:00 +01:00
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
 2019-07-03 10:59:38 +01:00
reivilibre 8033ab1c86 Fix Push Gateway API example: Field renamed to event_id 
I believe this was forgotten in:
71cb646541
 2019-07-03 10:36:16 +01:00
Travis Ralston ad5d46d331
Merge pull request #2148 from matrix-org/anoa/typooo 
Fix a small typo
 2019-06-25 10:08:06 -06:00
Andrew Morgan e88a074c9f Add changelog 2019-06-25 17:02:39 +01:00
Andrew Morgan 4997abc4b7 as as -> as 2019-06-25 16:47:10 +01:00
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.
 2019-06-18 18:42:23 -06:00
Jimmy Cuadra 8246383330 Fix typos in changelog entry. 2019-06-18 16:37:37 -07:00
Travis Ralston 204601d9a4
Merge pull request #2133 from matrix-org/travis/fix-olm-2 
Fix link to Olm signing specification
 2019-06-18 10:01:04 -06:00
Travis Ralston ffdd8dfe01
Merge pull request #2137 from matrix-org/identity_service/release-r0.2.1 
Identity r0.2.1
 2019-06-18 08:52:33 -06:00
Travis Ralston d09af5b191 Identity r0.2.1 2019-06-17 11:18:24 -06:00
Travis Ralston 954a5607c3
Merge pull request #2136 from ma1uta/master 
Fix typo.
 2019-06-17 00:12:39 -06:00
Travis Ralston c63b5aff69
Create 2136.clarification 2019-06-17 00:10:59 -06:00
Anatoly Sablin 802b90d113 Typo. 2019-06-16 22:24:06 +03:00
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.
 2019-06-15 13:44:58 -07:00
Travis Ralston 6f460ad70a minus spec 
according to the apache .htaccess we use
 2019-06-14 22:26:29 -06:00
Travis Ralston 33ca891e71 Fix link to Olm signing specification 
See https://github.com/matrix-org/matrix.org/issues/478
 2019-06-14 22:22:43 -06:00
Jimmy Cuadra 5384b61d95 Fix style issues brought up during code review. 
Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
 2019-06-14 17:35:39 -07:00