Commit graph

1259 commits

Author SHA1 Message Date
Travis Ralston
ff768ec75f
Merge pull request #2036 from matrix-org/travis/1.0/wk-fail-error
Clarify that FAIL_ERROR is not limited to just homeservers.
2019-05-30 16:56:28 -06:00
Travis Ralston
41a036a453
Merge pull request #2050 from matrix-org/travis/1.0/clarify-proposals
Synchronize proposals_intro.rst and CONTRIBUTING.rst
2019-05-29 18:26:53 -06:00
Travis Ralston
d2232aca97
Merge pull request #2042 from matrix-org/travis/1.0/ordered-flows
Clarify that login flows must be completed in order
2019-05-29 16:26:22 -06:00
Travis Ralston
78d93432f4 Synchronize proposals_intro.rst and CONTRIBUTING.rst 2019-05-29 14:00:34 -06:00
Travis Ralston
76829ad988
Merge pull request #2037 from matrix-org/travis/1.0/appservice-hs-token
Clarify how homeservers are meant to auth themselves to appservices
2019-05-28 12:56:28 -06:00
Travis Ralston
e2da3728a0 Only error if the token doesn't match 2019-05-28 12:53:48 -06:00
Travis Ralston
a8f61697d1
Merge pull request #2032 from matrix-org/travis/1.0/redaction-effects
Clarify how redactions affect room state
2019-05-28 12:52:42 -06:00
Travis Ralston
8151aa331f
Update specification/client_server_api.rst
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-05-28 12:51:36 -06:00
Travis Ralston
0580f51206 Clarify that failing to follow the flows == 401 2019-05-28 12:49:50 -06:00
Travis Ralston
4e58414b26 Clarify that clients should not ack their own messages
Fixes https://github.com/matrix-org/matrix-doc/issues/567
2019-05-27 23:20:09 -06:00
Travis Ralston
572a6056ad Clarify that login flows must be completed in order
Fixes https://github.com/matrix-org/matrix-doc/issues/1134

Evidence of this being the case is shown here: https://github.com/matrix-org/synapse/pull/5174
2019-05-27 23:16:21 -06:00
Travis Ralston
d0fd20fdb4 Clarify how homeservers are meant to auth themselves to appservices
Fixes https://github.com/matrix-org/matrix-doc/issues/1765

Note that the swagger definitions already say that authorization is required. It just wasn't mentioned in the spec.
2019-05-27 22:40:07 -06:00
Travis Ralston
10648aa9e8 Clarify that FAIL_ERROR is not limited to just homeservers.
Fixes https://github.com/matrix-org/matrix-doc/issues/1735
2019-05-27 22:30:37 -06:00
Travis Ralston
bf8ca3abba
Merge pull request #2026 from matrix-org/travis/1.0/msc1452-server-notices
Add server notices support
2019-05-27 21:22:33 -06:00
Travis Ralston
9acd960cf6
Update specification/client_server_api.rst
Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
2019-05-27 21:22:07 -06:00
Travis Ralston
ade346f8cc Add m.server_notice to reserved tags 2019-05-27 21:19:58 -06:00
Travis Ralston
d14dc1d8e1 Clarify that redacted state events affect the room with default values 2019-05-27 21:16:02 -06:00
Travis Ralston
e610f085a9
Merge pull request #2019 from matrix-org/travis/1.0/msc1884-msc2002-v4-rooms
Add version 4 rooms to the spec
2019-05-27 20:08:12 -06:00
Travis Ralston
23ab1c527a Clarify how redactions affect room state
Fixes https://github.com/matrix-org/matrix-doc/issues/1726
2019-05-26 22:16:12 -06:00
Travis Ralston
5eea4a477f Add server notices support
As per [MSC1452](https://github.com/matrix-org/matrix-doc/issues/1452) 

Fixes https://github.com/matrix-org/matrix-doc/issues/1254

Although MSC1452 focuses on just the warnings part of the server notices, the base for notices has not been established in the spec. This commit adds the needed support to be able to handle notices.

No intentional divergences from the proposal are included in this changeset. There are a few additions which are used in practice although not defined in the proposal, such as who is responsible for aesthetics, sending notices, and other misc rules.
2019-05-26 20:52:59 -06:00
Travis Ralston
5c268ef21f
Merge pull request #2020 from matrix-org/travis/1.0/msc1930-tombstone-notif
Add a .m.rule.tombstone default push rule for room upgrades
2019-05-25 09:03:34 -06:00
Travis Ralston
ceaccffdf7 Add a .m.rule.tombstone default push rule for room upgrades
As per [MSC1930](https://github.com/matrix-org/matrix-doc/pull/1930)

There are no known changes to this proposal since it was accepted.
2019-05-24 17:14:23 -06:00
Travis Ralston
3b0e194ff7 Add version 4 rooms to the spec
As per [MSC1884](https://github.com/matrix-org/matrix-doc/pull/1884) and [MSC2002](https://github.com/matrix-org/matrix-doc/pull/2002).

No known changes since the proposals were accepted.

Due to being in the area: This fixes https://github.com/matrix-org/matrix-doc/issues/1863
2019-05-24 15:50:05 -06:00
Travis Ralston
3c38956510 Remove prev_content from the redaction essential keys list
As per [MSC1954](https://github.com/matrix-org/matrix-doc/pull/1954)

No known changes since the proposal was accepted.
2019-05-24 11:57:22 -06:00
David Baker
c38581fb86
Too many spaces
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-05-14 19:20:01 +01:00
David Baker
383e02835e Words on using m.login.dummy for disambiguation
Add some text on how m.login.dummy can be used to distinguish
a flow that would otherwise be a subset of other flows.
2019-05-14 18:07:58 +01:00
Travis Ralston
ba18a6e9fa
Merge pull request #1992 from matrix-org/anoa/missing_punctuation3
Add missing period
2019-05-07 23:12:47 -06:00
Travis Ralston
ce904f9750
Merge pull request #1990 from matrix-org/anoa/missing_punctuation
Add missing period
2019-05-07 23:07:07 -06:00
Travis Ralston
c54a5fc3df
Merge pull request #1989 from matrix-org/anoa/typo2
Add missing 'as'
2019-05-07 23:06:46 -06:00
Andrew Morgan
57cf1aaa96 Add missing period 2019-05-07 19:37:25 -07:00
Andrew Morgan
40482f7616 Add missing period 2019-05-07 15:55:07 -07:00
Andrew Morgan
c233535de0 fix typo 2019-05-07 15:51:32 -07:00
Andrew Morgan
da82a42308 fix grammatical error 2019-05-07 15:40:39 -07:00
Richard van der Hoff
4e9dc2098f
Fix comments which refer to jenkins. (#1981)
* Fix comments which refer to jenkins.

* Spelling

Co-Authored-By: turt2live <travpc@gmail.com>
2019-04-30 17:43:21 +01:00
Travis Ralston
8ad82ce3c0 Add permalink routing through ?via parameters on matrix.to URIs
Spec for [MSC1704](https://github.com/matrix-org/matrix-doc/pull/1704)

Reference implementations:
* Original: https://github.com/matrix-org/matrix-react-sdk/pull/2250
* Modern recommendations: 2ca281f6b7/src/matrix-to.js (L29-L70)

The only deviation from the original MSC is the recommendation for which servers to pick. The original MSC failed to consider server ACLs and IP addresses correctly, and during implementation it was realized that both of these cases should be handled. The core principles of the original MSC are left unaltered.
2019-04-05 16:24:51 -06:00
Travis Ralston
1c5ec68cd0
Merge pull request #1876 from matrix-org/travis/v3-id-grammar
Clarify v3 event representation in identifier grammar
2019-03-27 08:57:11 -06:00
Hubert Chathi
d224c4ff71 fix some errors in key export format
- empirically, we don't acatually wrap the array in an object
- fix an incorrect type
2019-03-25 18:57:17 -04:00
Travis Ralston
0ec34039e8 URL encode all the things 2019-03-20 14:44:54 -06:00
Travis Ralston
42cf72c60f URL encode matrix.to URIs 2019-03-20 14:43:16 -06:00
Vikingat-RAGE
76ee13b9bb Fixed bad spacing. 2019-03-18 21:54:56 +00:00
Vikingat-RAGE
1a739ec97b E2E typo fix in spec 2019-03-18 21:16:52 +00:00
Travis Ralston
c08d223cfe
Merge pull request #1889 from ma1uta/push_rules
Fix for the #1865
2019-02-28 13:31:56 -07:00
Ben Parsons
99405418c9 in the appendices, thanks earfolds 2019-02-26 18:11:02 +00:00
Hristo Venev
e825224b5b Restrict identifier port numbers to 5 digits. 2019-02-21 21:27:21 +00:00
Travis Ralston
621437b0c5
Merge pull request #1891 from QMatrixClient/kitsune-drop-obsolete-text
Remove extended text about life without transaction IDs
2019-02-21 11:31:55 -07:00
Travis Ralston
49119ed345
Merge pull request #1875 from matrix-org/travis/clarify-upgrades
Clarify the recommendations for "transferable state"
2019-02-18 06:14:43 -07:00
Kitsune Ral
989d7ff192 Remove extended text about life without transaction IDs
Signed-off-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
2019-02-16 18:49:13 +09:00
Anatoly Sablin
befd76f853 Fix links. 2019-02-16 10:38:51 +03:00
Anatoly Sablin
17420c537a Fix links. 2019-02-16 08:56:02 +03:00
Anatoly Sablin
2de7ef9a3d #1865 Add the m.push_rules schema. 2019-02-15 23:23:38 +03:00