Will Hunt
8b92df74ab
s/medium/address
6 years ago
Will Hunt
a8c26d208b
Wrap
6 years ago
Will Hunt
3eff76b00a
MSC 2134
6 years ago
Travis Ralston
6f460ad70a
minus spec
...
according to the apache .htaccess we use
6 years ago
Travis Ralston
33ca891e71
Fix link to Olm signing specification
...
See https://github.com/matrix-org/matrix.org/issues/478
6 years ago
Jimmy Cuadra
5384b61d95
Fix style issues brought up during code review.
...
Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
6 years ago
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>
6 years ago
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.
6 years ago
Matthew Hodgson
aadf1cc733
Merge pull request #2131 from jimmycuadra/e2ee-easier-typo
...
Fix typo in key verification framework section.
6 years ago
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>
6 years ago
Jimmy Cuadra
2dd0da7d50
Fix typo in key verification framework section.
...
Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
6 years ago
Travis Ralston
50dee76fa7
Merge pull request #2122 from matrix-org/travis/fix-changelog
...
Fix changelog generation
6 years ago
Travis Ralston
cac72ff873
Merge pull request #2126 from matrix-org/travis/403-id-unbind
...
Add 403 error to IS unbind
6 years ago
Travis Ralston
8bfc42b284
Merge pull request #2128 from matrix-org/travis/fix-contributing
...
Fix contributing guide to say we're stable
6 years ago
Travis Ralston
decb75555c
We're stable now 🎉
6 years ago
Travis Ralston
a9297f9e6c
Merge pull request #2125 from jimmycuadra/m.notice-format
...
Add missing format fields to m.room.message$m.notice schema.
6 years ago
Jimmy Cuadra
e670fb1f5a
Add missing format fields to m.room.message$m.notice schema.
...
Signed-off-by: Jimmy Cuadra <jimmy@jimmycuadra.com>
6 years ago
Travis Ralston
2cafa7e1e8
Merge pull request #2124 from matrix-org/travis/fix-id-server-param
...
Remove incorrect id_server param from IS spec
6 years ago
Travis Ralston
67ea3b9ce8
Add 403 error to IS unbind
...
Fixes https://github.com/matrix-org/matrix-doc/issues/2117
6 years ago
Travis Ralston
b8f1f37927
Remove incorrect id_server param from IS spec
...
Fixes https://github.com/matrix-org/matrix-doc/issues/2118
6 years ago
Travis Ralston
d26cf7da92
Merge pull request #2123 from matrix-org/travis/fix-historical-ids
...
Exclude DEL from historical user IDs
6 years ago
Travis Ralston
18eca90022
Exclude DEL from historical user IDs
...
The range is inclusive, so don't include 7F
6 years ago
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".
6 years ago
Sorunome
26349417ba
update spoiler render idea
6 years ago
Travis Ralston
19a3d574b7
Fix HKDF rationale
6 years ago
Travis Ralston
ba5479e46f
Reference Canonical JSON
6 years ago
Travis Ralston
8f1f8b4fe5
Fix references to filtering
...
We can't have two different backlinks for the same text, so use LL as the label
6 years ago
Travis Ralston
98c9d93b20
Merge pull request #2113 from matrix-org/client_server/release-r0.5.0
...
Client-Server r0.5.0
6 years ago
Travis Ralston
497c6875ac
Merge pull request #2112 from matrix-org/server_server/release-r0.1.2
...
Federation r0.1.2
6 years ago
Travis Ralston
67d12165e8
Merge pull request #2111 from matrix-org/identity_service/release-r0.2.0
...
Identity r0.2.0
6 years ago
Travis Ralston
1e9308cbc9
Merge pull request #2109 from matrix-org/application_service/release-r0.1.1
...
Appservice r0.1.1
6 years ago
Travis Ralston
1ca60bf5d7
Client-Server r0.5.0
6 years ago
Travis Ralston
8e6ccf0a0e
Federation r0.1.2
6 years ago
Travis Ralston
34ad81e81b
Identity r0.2.0
6 years ago
Travis Ralston
4f915f2760
Appservice r0.1.1
6 years ago
Travis Ralston
f44483a8cf
Merge pull request #2099 from matrix-org/travis/1.0/1.0-notice
...
Declare Matrix 1.0 in the index
6 years ago
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
6 years ago
Travis Ralston
c9345ba6a3
Never forget the past
6 years ago
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
6 years ago
Travis Ralston
8b7887dfc2
Link to key algorithms section
6 years ago
Travis Ralston
19f017f9bd
Merge pull request #2035 from matrix-org/travis/1.0/msc688-msc1227-lazy-loading
...
Spec lazy-loading room members
6 years ago
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
6 years ago
Travis Ralston
56745c76aa
Clarify that submit_url being not present only matters for r0.5
6 years ago
Travis Ralston
85f34f942f
Fix invalid doc error
...
Another annoying case of Swagger fighting us
6 years ago
Travis Ralston
f7aa2adfb4
Fix indentation
6 years ago
Travis Ralston
6d60258e25
Merge pull request #2080 from matrix-org/travis/1.0/msc2076-msc2077-v5-rooms
...
Spec v5 rooms: Key validity
6 years ago
Travis Ralston
b32f0e768f
clarify that UIA can now be done by the HS
6 years ago
Travis Ralston
ca8b539b2f
humans prefer to be treated as people
6 years ago
Travis Ralston
370ae8b9fe
Merge pull request #2068 from matrix-org/travis/1.0/mxc
...
Refactor documentation for content/media repository
6 years ago
Travis Ralston
04930c6ddf
Don't enforce MXC URIs, but also don't confuse people
6 years ago