Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-25 18:38:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4246 commits 30 branches 42 tags 32 MiB
Commit graph

421 commits

Author SHA1 Message Date
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
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 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 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 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 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 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 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 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 572d29348c
Update changelogs/client_server/newsfragments/2101.breaking 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-06-11 00:18:37 +01:00
Travis Ralston 32761fc108
Merge pull request #2098 from matrix-org/travis/1.0/modules-update 
Clarify what a "module" is and update feature profiles for clients
 2019-06-10 14:05:15 -06:00
Travis Ralston f047e235df Merge branch 'master' into travis/1.0/event-ids 2019-06-10 10:52:34 -06:00
Travis Ralston 7fe7d365e2
Merge pull request #2089 from matrix-org/travis/1.0/cors 
Clarify when and where CORS headers should be returned
 2019-06-10 07:21:52 -06:00
Andrew Morgan 0f82056ca2 Highlight breaking change 2019-06-10 08:43:34 +01:00
Andrew Morgan ab0c1bc054 Add changelog, update imperative check, rename sid.yaml 2019-06-10 08:41:35 +01:00
Travis Ralston 4b6e2cc956
Merge pull request #2072 from matrix-org/travis/1.0/msc1717-msc1267-sas-verification 
Spec SAS verification and the common key verification framework
 2019-06-07 10:34:08 -06:00
Travis Ralston 00588efd3f
Merge pull request #2086 from matrix-org/travis/1.0/fed-content-type 
Clarify that the default s2s transport is JSON over HTTP
 2019-06-07 10:12:59 -06:00
Travis Ralston 906d3cd447
Merge pull request #2055 from matrix-org/travis/1.0/registration-clarification 
Clarify guest accounts and `auth` usage on /register
 2019-06-07 10:05:56 -06:00
Travis Ralston 6a4a6db1bd
Merge pull request #2081 from matrix-org/travis/1.0/pdu-signatures 
Clarify which servers are supposed to sign events
 2019-06-07 08:56:14 -06:00
Travis Ralston f4e85853d4
Merge pull request #2054 from matrix-org/travis/1.0/uia-clarifications 
Clarify that UIA stages cannot be attempted twice
 2019-06-07 07:38:40 -06:00