wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4216 commits 4 branches 0 tags 17 MiB
Commit graph

4216 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
50dee76fa7
Merge pull request #2122 from matrix-org/travis/fix-changelog 
Fix changelog generation
 2019-06-13 19:19:32 -06: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
8bfc42b284
Merge pull request #2128 from matrix-org/travis/fix-contributing 
Fix contributing guide to say we're stable
 2019-06-12 19:31:17 -06:00
Travis Ralston
decb75555c
We're stable now 🎉 2019-06-12 18:09:15 -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
2cafa7e1e8
Merge pull request #2124 from matrix-org/travis/fix-id-server-param 
Remove incorrect id_server param from IS spec
 2019-06-12 16:55:45 -06: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
Travis Ralston
d26cf7da92
Merge pull request #2123 from matrix-org/travis/fix-historical-ids 
Exclude DEL from historical user IDs
 2019-06-12 13:50:51 -06:00
Travis Ralston
18eca90022 Exclude DEL from historical user IDs 
The range is inclusive, so don't include 7F
 2019-06-12 13:48:50 -06:00
Travis Ralston
e60d2defbd Fix changelog generation 
Only include the target version, not all versions. Additionally, make sure the appservice spec isn't hardcoded as "unstable".
 2019-06-12 13:47:09 -06:00
Travis Ralston
19a3d574b7 Fix HKDF rationale 2019-06-11 11:31:24 -06:00
Travis Ralston
ba5479e46f Reference Canonical JSON 2019-06-11 11:30:04 -06:00
Travis Ralston
8f1f8b4fe5 Fix references to filtering 
We can't have two different backlinks for the same text, so use LL as the label
 2019-06-11 11:28:35 -06:00
Travis Ralston
98c9d93b20
Merge pull request #2113 from matrix-org/client_server/release-r0.5.0 
Client-Server r0.5.0
 2019-06-11 10:54:06 -06:00
Travis Ralston
497c6875ac
Merge pull request #2112 from matrix-org/server_server/release-r0.1.2 
Federation r0.1.2
 2019-06-11 10:53:56 -06:00
Travis Ralston
67d12165e8
Merge pull request #2111 from matrix-org/identity_service/release-r0.2.0 
Identity r0.2.0
 2019-06-11 10:53:44 -06:00
Travis Ralston
1e9308cbc9
Merge pull request #2109 from matrix-org/application_service/release-r0.1.1 
Appservice r0.1.1
 2019-06-11 10:41:40 -06:00
Travis Ralston
1ca60bf5d7 Client-Server r0.5.0 2019-06-11 10:40:48 -06:00
Travis Ralston
8e6ccf0a0e Federation r0.1.2 2019-06-11 10:38:12 -06:00
Travis Ralston
34ad81e81b Identity r0.2.0 2019-06-11 10:30:56 -06:00
Travis Ralston
4f915f2760 Appservice r0.1.1 2019-06-11 10:15:51 -06:00
Travis Ralston
f44483a8cf
Merge pull request #2099 from matrix-org/travis/1.0/1.0-notice 
Declare Matrix 1.0 in the index
 2019-06-11 09:56:55 -06:00
Travis Ralston
2d18f81807
Merge pull request #2087 from matrix-org/travis/1.0/events-are-extensible 
Reorganize event structure in c2s spec and clarify event capabilities
 2019-06-11 09:55:17 -06:00
Travis Ralston
c9345ba6a3 Never forget the past 2019-06-11 09:53:36 -06:00
Travis Ralston
8ac555f870
Merge pull request #2083 from matrix-org/travis/1.0/key-object 
Clarify the key object definition for the key management API
 2019-06-11 09:50:34 -06:00
Travis Ralston
8b7887dfc2 Link to key algorithms section 2019-06-11 09:47:02 -06:00
Travis Ralston
19f017f9bd
Merge pull request #2035 from matrix-org/travis/1.0/msc688-msc1227-lazy-loading 
Spec lazy-loading room members
 2019-06-11 09:39:32 -06:00
Travis Ralston
fbdb56a29f
Merge pull request #2101 from matrix-org/anoa/hs_3pid_tokens 
Add submit_url field to requestToken responses, clarify HS's can send tokens themselves
 2019-06-11 09:25:53 -06:00
Travis Ralston
56745c76aa Clarify that submit_url being not present only matters for r0.5 2019-06-11 09:22:02 -06:00
Travis Ralston
85f34f942f Fix invalid doc error 
Another annoying case of Swagger fighting us
 2019-06-11 09:18:29 -06:00
Travis Ralston
f7aa2adfb4 Fix indentation 2019-06-11 09:16:44 -06:00
Travis Ralston
6d60258e25
Merge pull request #2080 from matrix-org/travis/1.0/msc2076-msc2077-v5-rooms 
Spec v5 rooms: Key validity
 2019-06-11 08:51:25 -06:00
Travis Ralston
b32f0e768f clarify that UIA can now be done by the HS 2019-06-11 08:47:40 -06:00
Travis Ralston
ca8b539b2f humans prefer to be treated as people 2019-06-11 08:47:25 -06:00
Travis Ralston
370ae8b9fe
Merge pull request #2068 from matrix-org/travis/1.0/mxc 
Refactor documentation for content/media repository
 2019-06-11 08:32:06 -06:00
Travis Ralston
04930c6ddf Don't enforce MXC URIs, but also don't confuse people 2019-06-11 08:29:50 -06:00
Travis Ralston
ad3aa5edf0
Merge pull request #2104 from matrix-org/travis/1.0/event-ids 
Clarify that the common identifier format can be broken
 2019-06-11 07:51:34 -06:00
Travis Ralston
b7378a860a
Merge pull request #2097 from matrix-org/travis/1.0/common-themes 
Specify some of the common concepts for Matrix in the index
 2019-06-11 07:51:06 -06:00
Travis Ralston
c1c26859e2
Merge pull request #2096 from matrix-org/travis/1.0/read-notifs 
Clarify how notification counts are calculated in /sync
 2019-06-11 07:50:33 -06:00
Travis Ralston
39b79fe453
Merge pull request #2088 from matrix-org/travis/1.0/duplicate-state-endpoint 
Merge GET/PUT /state/:event_type endpoints
 2019-06-11 07:49:20 -06:00
Andrew Morgan
5f24f63338 Better wording 2019-06-10 19:21:14 -04:00
Andrew Morgan
1a22508e15 identity server -> the server 2019-06-10 19:18:58 -04:00
Andrew Morgan
572d29348c
Update changelogs/client_server/newsfragments/2101.breaking 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-06-11 00:18:37 +01:00