Commit graph

4244 commits

Author SHA1 Message Date
Travis Ralston
b6f0e8e8ed Clarify that the query string is because they are widgets 2019-08-21 17:50:18 -06:00
Travis Ralston
8b85fda52c Add a link to the widget MSC to try and stem questions 2019-08-21 17:47:55 -06:00
Travis Ralston
788796e1c6 Multiple clarifications 2019-08-20 09:20:07 -06:00
Travis Ralston
9e073e9647
Speeeeeeling
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-08-19 10:42:30 -06:00
Travis Ralston
865d3da0f8 General clarity improvements 2019-08-16 19:59:32 -06:00
Travis Ralston
22c9692684 Disclose origin story better 2019-08-16 19:53:28 -06:00
Travis Ralston
8897ea4bb1 Merge branch 'master' into travis/msc/integrations/discovery 2019-06-27 21:56:23 -06:00
Travis Ralston
e80753e56c Add .well-known discovery 2019-06-27 18:24:42 -06: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
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