Commit graph

409 commits

Author SHA1 Message Date
Hubert Chathi ec0b9badc7 Merge remote-tracking branch 'origin/master' into cross-signing-spec 2020-05-29 17:25:19 -04:00
Hubert Chathi 67edc3e229 add clarifications and diagrams 2020-05-29 17:25:07 -04:00
Travis Ralston c3289614da
Merge pull request #2562 from matrix-org/travis/spec/2432-alias-semantics
Add spec for new alias handling (client-server)
2020-05-26 13:04:32 -06:00
Hubert Chathi a1177cbd61
Merge pull request #2566 from uhoreg/remove_string_string_string
E2E clarifications/improvements
2020-05-25 13:01:47 -04:00
Tulir Asokan 5270ed0c0a Fix typo in read markers module
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2020-05-24 14:24:49 +03:00
Hubert Chathi 6a8ba9b1d6 improve description of key object in CS and include a link in Fed 2020-05-22 16:10:16 -04:00
Travis Ralston b11cf560b5 Add spec for new alias handling (client-server)
MSC: https://github.com/matrix-org/matrix-doc/pull/2432

This commit does not deal with areas which will be covered by the room version specifications (namely the redaction algorithm).

It feels a bit overly cruel to completely obliterate all mentions of `m.room.aliases` from the spec as client/server developers may encounter the event type in the wild. To ensure that CTRL+F still works, a brief mention that they do nothing has been put in place, leaving no other references (except the redaction algorithm - see previous paragraph).
2020-05-20 20:10:52 -06:00
Travis Ralston ddeb695b97
Use 'several' in place of counting 2020-05-18 00:19:30 -06:00
Nicolas Werner a7e7496cd6 Fix some numbers in the spec text.
Odds were not written as an exponent.
Special tag names count was not updated.

Fixes #2550

Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
2020-05-17 22:20:29 +02:00
Hubert Chathi a8910fe323 initial spec for cross-signing 2020-05-12 17:24:06 -04:00
Hubert Chathi e89521d195 some fixes (spelling, RST, and naming) 2020-05-04 22:08:22 -04:00
David Vo 0ae597626a Fix .m.rule.contains_user_name push rule to highlight
Signed-off-by: David Vo <david@vovo.id.au>
2020-05-01 00:32:15 +10:00
Lukas Lihotzki af7cf84083 Fix iv parameter description
Signed-off-by: Lukas Lihotzki <lukas@lihotzki.de>
2020-04-07 17:54:09 +02:00
Runster e6c7eac023
Correct name of Phil Zimmermann 2020-03-06 18:11:28 +01:00
Travis Ralston 6d475ebd57
Remove whitespace
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2020-02-17 12:56:28 -07:00
Travis Ralston c7942d1cec Spec moderation policy rooms (MSC2313)
MSC: https://github.com/matrix-org/matrix-doc/pull/2313
2020-02-12 21:58:57 -07:00
Nicolas Werner 6911171e83 Fix key export format example
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
2020-02-06 09:52:03 +01:00
Alexey Murz Korepov daa610659b
Typo: later user » later use 2019-11-10 16:45:01 +03:00
Travis Ralston eebcaaef02 Point to the new v2 identity endpoint 2019-09-24 13:30:24 -06:00
Damir Jelić a96a2f3fce Fix the action of a room key request cancellation.
The spec states that the action of a room key request cancellation
should be "cancel_request" but every known implementation uses
"request_cancellation" instead.

This patch fixes the spec to reflect the implementations.
2019-08-26 12:21:23 +02:00
Travis Ralston a171d5f6fd Check for a state_key on the tombstone push rule
This is an oversight from the proposal.
2019-08-08 09:29:52 -06:00
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
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 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 19a3d574b7 Fix HKDF rationale 2019-06-11 11:31:24 -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 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 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 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 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 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 1886a2346a Move explanation of notifications to notifications module 2019-06-10 13:38:43 -06:00
Matthew Hodgson 0506d09cf7 incorporate LL review from matthew 2019-06-10 19:38:44 +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 46747e897e ing 2019-06-07 10:32:06 -06:00
Travis Ralston 77c4c4b07c Add general clarity 2019-06-07 08:27:18 -06:00
Travis Ralston 5ec1a50b94 Linefeeds and other clarifications 2019-06-07 08:12:09 -06:00
Travis Ralston 3877896a4c Clarify how we now expect verification to be done 2019-06-07 08:10:52 -06:00
Travis Ralston d49c7fb3b0
Apply suggestions from code review
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-06-07 08:01:17 -06:00
Travis Ralston cd6b012523 Clarify what a "module" is and update feature profiles for clients
Fixes https://github.com/matrix-org/matrix-doc/issues/2009
2019-06-06 17:07:49 -06:00
Travis Ralston f0eb495cee Clarify how notification counts are calculated in /sync
Fixes https://github.com/matrix-org/matrix-doc/issues/2015
2019-06-06 15:41:28 -06:00
Travis Ralston de725c26cc Add more clarity to the media repo 2019-06-05 10:37:22 -06:00
Travis Ralston aa110b2be2
Merge pull request #2025 from matrix-org/travis/1.0/3rdpartysigned
Fix third party signed definitions for join APIs
2019-06-05 07:10:19 -06:00
Travis Ralston a3364ff357 Spec SAS verification and the common key verification framework
Reference implementations:
* 94f664e725
* https://github.com/matrix-org/matrix-react-sdk/pull/2461
* https://github.com/matrix-org/matrix-js-sdk/pull/818
* https://github.com/matrix-org/matrix-react-sdk/pull/2596
* https://github.com/matrix-org/matrix-js-sdk/pull/837

Proposals:
* [MSC1717](https://github.com/matrix-org/matrix-doc/pull/1717)
* [MSC1267](https://github.com/matrix-org/matrix-doc/issues/1267)

No alterations to either proposal have been made intentionally here.
2019-06-04 12:43:47 -06:00
Travis Ralston 39144942da
Fix title ordering 2019-06-03 20:39:41 -06:00
Travis Ralston 1f86e8e31b Refactor documentation for content/media repository
Fixes https://github.com/matrix-org/matrix-doc/issues/2060
Fixes https://github.com/matrix-org/matrix-doc/issues/772
Fixes https://github.com/matrix-org/matrix-doc/issues/888
2019-06-02 21:25:11 -06:00
Travis Ralston 57e3b152b0 Move section to under Olm stuff 2019-05-31 11:37:09 -06:00
Travis Ralston 754b19bb92
typo
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-05-31 10:21:16 -06:00