Commit graph

448 commits

Author SHA1 Message Date
Kitsune Ral
6b37bb1dd9 Merge remote-tracking branch 'remotes/origin/master' into kitsune-map-to-enum-support 2019-10-03 11:06:27 +09:00
Kitsune Ral
79f16d40a9
Add a full stop
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-10-03 08:28:05 +09:00
Travis Ralston
5cb7599196 Changelog 2019-09-24 13:39:33 -06:00
Travis Ralston
2c88f02daa
Merge pull request #2287 from matrix-org/travis/spec/lookup-v2
Spec the v2 lookup API
2019-09-16 08:45:11 -06:00
Travis Ralston
b3e2326d8b changelog 2019-09-09 19:59:18 -06:00
Travis Ralston
30a9de7e02 Merge branch 'master' into travis/spec/is-unbind 2019-09-06 13:05:19 -06:00
Travis Ralston
a24bcc2c0a
Merge pull request #2258 from matrix-org/travis/spec/is-terms
Spec IS terms of service
2019-09-06 10:29:47 -06:00
Travis Ralston
f7e00b19e9
Merge pull request #2255 from matrix-org/travis/spec/is-auth
Spec the v2 IS auth APIs
2019-09-06 10:29:08 -06:00
Travis Ralston
185c564a13 Spec client-server IS unbind API
As per [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140)

Note: this modifies the endpoint in MSC2140 to be more in line with the remainder of the proposal.
2019-09-04 16:38:15 -06:00
Travis Ralston
2d784d93ef Merge branch 'master' into travis/spec/is-auth 2019-09-04 16:35:50 -06:00
Travis Ralston
6ec7d4cd89 changelog 2019-09-04 16:20:14 -06:00
Travis Ralston
caf46db6e7 Changelog 2019-09-03 15:04:58 -06:00
Travis Ralston
afd5018494 Spec the terms of service handling for identity servers
Part of MSC2140

Convert status codes to strings if there is a string status code. Fixes a build error when we mix 4xx and 403 in the same definition. We also have to correct stringified numbers to pass the build.
2019-09-03 14:04:05 -06:00
Travis Ralston
fad9974383 Add missed changelog from prior PR 2019-08-28 15:47:08 -06:00
Travis Ralston
aa98137514 Add changelog 2019-08-28 15:47:08 -06:00
Damir Jelić
35eb1993d9 Add a changelog fragment for the room key request action fix. 2019-08-26 17:40:32 +02:00
Kitsune Ral
31c132ec82 Add changelog 2019-08-25 17:39:36 +09:00
Andrew Morgan
92c6f4c38e
Add M_USER_DEACTIVATED to list of error codes (#2234)
Spec PR for [MSC 2181](https://github.com/matrix-org/matrix-doc/pull/2181).

Adds the `M_USER_DEACTIVATED` error code and a short description to the client-server API.
2019-08-15 18:10:38 +01:00
Travis Ralston
a171d5f6fd Check for a state_key on the tombstone push rule
This is an oversight from the proposal.
2019-08-08 09:29:52 -06:00
Dominic Fischer
a63fab20ee Fix some typos
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2019-08-03 18:07:22 +01:00
Andrew Morgan
28596a6c74 Add missing changelog for #2204. 2019-07-31 15:21:40 +01:00
Travis Ralston
d4ce3a0181
Merge pull request #2201 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 #2202 from matrix-org/application_service/release-r0.1.2
Appservices r0.1.2 release
2019-07-30 13:38:14 -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
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
7b0f5ea77b
Merge pull request #2159 from jimmycuadra/reference-hash-purpose
Clarify the purpose of reference hashes.
2019-07-09 16:27:44 -06: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
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
J. Ryan Stinnett
9208c5cd13 Add changelog 2019-07-03 11:34:00 +01:00
Andrew Morgan
e88a074c9f Add changelog 2019-06-25 17:02:39 +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
d09af5b191 Identity r0.2.1 2019-06-17 11:18:24 -06:00
Travis Ralston
c63b5aff69
Create 2136.clarification 2019-06-17 00:10:59 -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
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.
2019-06-14 14:58:57 -06:00
Matthew Hodgson
aadf1cc733
Merge pull request #2131 from jimmycuadra/e2ee-easier-typo
Fix typo in key verification framework section.
2019-06-14 21:56:29 +01:00
Jimmy Cuadra
b885714d94 Remove the "required" designation from the url field of certain
m.room.message msgtypes.

Now that content referenced by the *m.audio*, *m.file*, *m.image*, and
*m.video* message types can be encrypted, the `url` field is required
*only* if the content is unencrypted. The "required" designation in the
event schemas (which prefixes the field description with "Required" in
bold in the generated HTML) is used to indicate fields which must always
be present, and this is no longer the case.

Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
2019-06-14 13:49:14 -07:00
Jimmy Cuadra
2dd0da7d50 Fix typo in key verification framework section.
Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
2019-06-14 13:48:07 -07:00
Travis Ralston
cac72ff873
Merge pull request #2126 from matrix-org/travis/403-id-unbind
Add 403 error to IS unbind
2019-06-13 06:25:28 -06:00
Travis Ralston
a9297f9e6c
Merge pull request #2125 from jimmycuadra/m.notice-format
Add missing format fields to m.room.message$m.notice schema.
2019-06-12 17:48:56 -06:00
Jimmy Cuadra
e670fb1f5a Add missing format fields to m.room.message$m.notice schema.
Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
2019-06-12 16:36:58 -07:00
Travis Ralston
67ea3b9ce8 Add 403 error to IS unbind
Fixes https://github.com/matrix-org/matrix-doc/issues/2117
2019-06-12 15:41:10 -06:00
Travis Ralston
b8f1f37927 Remove incorrect id_server param from IS spec
Fixes https://github.com/matrix-org/matrix-doc/issues/2118
2019-06-12 15:29:25 -06:00