Commit Graph

4265 Commits

Author SHA1 Message Date
Andrew Morgan f0256a92bb fixes 2019-08-01 16:18:13 +01:00
Andrew Morgan f7f7fcafd7 Fix title 2019-08-01 16:11:48 +01:00
Andrew Morgan 943a9ae96c Proposal for Identity Servers Storing Threepid Hashes at Rest 2019-08-01 16:10:53 +01:00
Andrew Morgan 136eea8578 Merge branch 'master' of github.com:matrix-org/matrix-doc 2019-07-31 15:21:56 +01:00
Andrew Morgan 28596a6c74 Add missing changelog for . 2019-07-31 15:21:40 +01:00
Andrew Morgan af60889eee
Clarify that /rooms/{roomId}/event/{eventId}'s 404 should be M_NOT_FOUND ()
No error code is specified for this endpoint's 404. State that it should be an `M_NOT_FOUND`.
2019-07-31 15:14:38 +01:00
Andrew Morgan f989263872
MSC2181: Add an Error Code for Signaling a Deactivated User () 2019-07-31 13:14:02 +01:00
Richard van der Hoff 0c7c48bd12 MSC2175: Remove the `creator` field from `m.room.create` events ()
Fixes 
2019-07-31 13:13:38 +01:00
Travis Ralston d4ce3a0181
Merge pull request from matrix-org/push_gateway/release-r0.1.1
Push r0.1.1 release
2019-07-30 13:38:23 -06:00
Travis Ralston cfc502a2f1
Merge pull request from matrix-org/application_service/release-r0.1.2
Appservices r0.1.2 release
2019-07-30 13:38:14 -06:00
Travis Ralston acde333acc
Merge pull request from matrix-org/server_server/release-r0.1.3
Server-server r0.1.3 release
2019-07-30 13:37:38 -06:00
Travis Ralston 26c2ce8a92 Server-server r0.1.3 changelog 2019-07-30 13:05:32 -06:00
Travis Ralston 0b49112399 Appservices r0.1.2 changelog 2019-07-30 13:02:04 -06:00
Travis Ralston 40e6f82cbd Push r0.1.1 changelog 2019-07-30 12:54:50 -06:00
Travis Ralston 0631595484
Merge pull request from matrix-org/travis/changelogs
Fix/add changelogs
2019-07-30 07:37:09 -06:00
Travis Ralston 62f7a4f82c Fix/add changelogs
The push spec one was missed in https://github.com/matrix-org/matrix-doc/pull/2151
2019-07-29 21:06:17 -06:00
Travis Ralston 2a2dddab94
Merge pull request 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 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 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 ()
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 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 

Signed-off-by: Alexey Andreyev <aa13q@ya.ru>
2019-07-08 22:28:32 +03:00
Travis Ralston db5ce0c69e
Merge pull request 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 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 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 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 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 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
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>
2019-06-14 16:20:51 -07:00