J. Ryan Stinnett
4c65660b96
Clarify .m.rule.room_one_to_one push rule
...
This clarifies the `.m.rule.room_one_to_one` push rule by adding a condition on
event type. Some parts of the spec already had this info, while others were
missing it. Synapse has had this behaviour since the push rule appeared.
Fixes https://github.com/matrix-org/matrix-doc/issues/2150
2019-07-03 10:59:38 +01:00
Andrew Morgan
4997abc4b7
as as -> as
2019-06-25 16:47:10 +01: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
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
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
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
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
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
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
b32f0e768f
clarify that UIA can now be done by the HS
2019-06-11 08:47:40 -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
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
ad2eefdde9
Shuffle and clarify identifier grammar
...
Specifically, make it clearer that event IDs are the weird exception in this section.
2019-06-10 14:23:04 -06: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
37e2d81d58
Hardcode the state event fields table into the spec
...
See comment for why.
2019-06-10 14:04:27 -06:00
Travis Ralston
51698a5dd5
Clarify that people must own the namespace to use it
2019-06-10 14:04:14 -06:00
Travis Ralston
19c827e581
Remove trailing slashes section
2019-06-10 13:49:05 -06:00
Travis Ralston
49831fb74f
Clarifications about namespaces
2019-06-10 13:48:55 -06:00
Travis Ralston
1886a2346a
Move explanation of notifications to notifications module
2019-06-10 13:38:43 -06:00
Travis Ralston
cf19f52576
Enforce 7 day validity requirement everywhere
...
also misc formatting fixes
2019-06-10 13:21:24 -06:00
Matthew Hodgson
0506d09cf7
incorporate LL review from matthew
2019-06-10 19:38:44 +01: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
Travis Ralston
29340c6eb8
Clarify that the common identifier format can be broken
...
We already reference in the Event IDs section that the format depends on the room version, so we just need to link there.
Fixes https://github.com/matrix-org/matrix-doc/issues/2103
2019-06-09 22:50:23 -06:00
Matthew Hodgson
950415c72a
Merge branch 'master' into matthew/msc1779
2019-06-07 19:19:19 +01:00
Travis Ralston
a38af2009f
Apply suggestions from code review
...
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-06-07 10:37:57 -06: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
46747e897e
ing
2019-06-07 10:32:06 -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
ac27728c0a
Merge pull request #2082 from matrix-org/travis/1.0/v4-default
...
Make v4 the "default" room version
2019-06-07 10:11:49 -06:00
Travis Ralston
e4339fd687
More clarity
2019-06-07 09:01:14 -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
4c82553df4
Merge pull request #2047 from matrix-org/travis/1.0/test-vectors
...
Fix test vectors with invalid JSON and signature
2019-06-07 08:54:35 -06:00
Travis Ralston
360ac0b900
Update specification/server_server_api.rst
...
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-06-07 08:54:21 -06:00