Travis Ralston
e9bac1b011
Remove wrong references to TLS fingerprints
...
Also fix some styling in the server discovery section - this didn't feel like it needed its own commit.
2019-02-04 13:50:17 -07:00
Travis Ralston
1f5783b329
fix links and wording
2019-02-01 18:07:55 -07:00
Travis Ralston
9631e4bcb1
Add a bit of text to ensure that the intro page isn't missed
2019-02-01 18:01:01 -07:00
Travis Ralston
8ace64bab7
r0.1.0 of the s2s specification
2019-02-01 16:10:22 -07:00
Travis Ralston
9364787b9c
Remove stability warning
2019-02-01 16:09:48 -07:00
Aaron Raimist
fe7f582233
Fix several spelling mistakes
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-02-01 16:43:46 -06:00
Travis Ralston
d94a70f49d
Warn clients about changes in event format
2019-02-01 08:40:18 -07:00
Travis Ralston
e27c83d9f8
Merge pull request #1817 from matrix-org/neilj/remove_presence_lists
...
remove references to presence lists
2019-02-01 08:37:08 -07:00
Travis Ralston
41e50d553e
Merge pull request #1830 from matrix-org/travis/spec/x509-wk
...
Specify .well-known s2s discovery and X.509 validation
2019-02-01 08:36:55 -07:00
Travis Ralston
6421582bf2
Clarifications and alter the error handling of .well-known
...
Note that MSC1831 changes the order, so the changes to MSC1708 might not make sense when combining all the proposals together. However, independently the change should make sense.
2019-02-01 08:18:12 -07:00
Richard van der Hoff
39b71413be
Update specification/server_server_api.rst
...
Co-Authored-By: turt2live <travpc@gmail.com>
2019-02-01 07:40:39 -07:00
Travis Ralston
1c30f5eba9
Clarify certificate usage and ports
2019-01-31 21:15:47 -07:00
Travis Ralston
df01acc6e2
Merge pull request #1828 from matrix-org/travis/spec/rooms-v3
...
Add specification for room version 3: Event IDs as hashes
2019-01-31 17:59:31 -07:00
Travis Ralston
a6243da03f
Wording changes and links
2019-01-31 17:58:42 -07:00
Travis Ralston
48912a7320
Fix auth rules of redactions in v3
2019-01-31 17:35:25 -07:00
Travis Ralston
ad64af3f01
Clarify how reference hashes are done
2019-01-31 17:22:55 -07:00
Travis Ralston
01556e5b17
Clarifications and bug fixes in how v3 rooms work
2019-01-31 16:44:37 -07:00
Travis Ralston
3c17a0e53b
Mention caching
2019-01-31 16:29:07 -07:00
Travis Ralston
b971bcee7d
Accurately represent the 3 proposals and provide more detail
2019-01-31 16:24:07 -07:00
Travis Ralston
48e4d6e412
Document domain reuse concerns
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1783
2019-01-31 12:27:09 -07:00
Travis Ralston
d2f012f4ea
Incorporate MSC1831
...
Original proposal: https://github.com/matrix-org/matrix-doc/pull/1831
Implementation proof: pending
2019-01-31 11:17:56 -07:00
Travis Ralston
0347e873ef
Specify .well-known s2s discovery and X.509 validation
...
Original proposals:
* https://github.com/matrix-org/matrix-doc/pull/1708 (note: the JSON requirements were softened by https://github.com/matrix-org/matrix-doc/pull/1824 )
* https://github.com/matrix-org/matrix-doc/pull/1711
Implementation proofs:
* https://github.com/matrix-org/synapse/pull/4489
* No explicit PRs for MSC1711 could be found, however Synapse is known to implement it.
There are no intentional changes which differ from the proposals in this commit, however the author has relied upon various historical conversations outside of the proposals to gain the required context. Inaccuracies introduced by the author are purely accidental.
2019-01-30 22:11:31 -07:00
Travis Ralston
ccce6c196d
Specify how capabilities work in the c2s API
...
Original proposals:
* https://github.com/matrix-org/matrix-doc/pull/1753
* https://github.com/matrix-org/matrix-doc/pull/1804
Implementation proof:
* https://github.com/matrix-org/synapse/pull/4472
* https://github.com/matrix-org/matrix-js-sdk/pull/830
There is one change to MSC1753 which is included in this commit. MSC1804 remains unchanged. In the original proposal, the change password capability being present was an indication that password changes were possible. It was found that this doesn't really communicate the state very well to clients in that lack of a capability (or a 404, etc) would mean that users would erroneously not be able to change their passwords. A simple boolean flag was added to assist clients in detecting this capability.
2019-01-30 19:43:55 -07:00
Travis Ralston
ff75996524
Add specification for room version 3: Event IDs as hashes
...
Original proposal: https://github.com/matrix-org/matrix-doc/pull/1659
Implementation proofs (some traversing of the PR tree may be required to get all of them):
* https://github.com/matrix-org/synapse/pull/4483
* https://github.com/matrix-org/synapse/pull/4499
This doesn't intentionally change anything from the proposal.
**Implementation details**:
The simple part of this is the introduction of a rooms/v3.html document. The somewhat unclear part is the stuff done to the s2s definitions. This pulls `unsigned_pdu` out to `unsigned_pdu_base` (all fields except `event_id`) where it can be reused in `pdu` and `pdu_v3` (for rooms v3). These definitions are further moved into the room version specifications where they can highlight the exact schemas in detail.
Version 1 has been updated to include the pre-existing event format, however the core principles of the room have not been changed. The same applies to room version 2. Room versions have immutable core principles once in the spec, otherwise these format changes would land in a pre-existing version.
The client-server API event formats will need updating, however that is being punted to a different commit to try and keep these changes reviewable.
2019-01-30 17:03:03 -07:00
Neil Johnson
c09fa6845e
Update presence.rst
2019-01-29 18:23:30 +00:00
Travis Ralston
00adfdbf4a
Merge pull request #1820 from matrix-org/travis/spec/fed-v2-invite
...
Specification for v2 s2s invite API
2019-01-29 09:12:21 -07:00
Andrew Morgan
0712fd36a2
75% majority now required for FCP
2019-01-29 14:36:26 +00:00
Travis Ralston
aca9437bf3
Specification for v2 s2s invite API
...
Original proposal: https://github.com/matrix-org/matrix-doc/pull/1794
Implementation proofs:
* https://github.com/matrix-org/synapse/pull/4402
* https://github.com/matrix-org/synapse/pull/4496
There are no changes from the original proposal.
2019-01-28 21:07:00 -07:00
Neil Johnson
bf2b6e6daa
remove references to presence lists
2019-01-28 15:05:10 +00:00
Matthew Hodgson
a358e2d4d8
rst
2019-01-28 14:58:17 +00:00
Richard van der Hoff
9f443225ac
fix incorrect spelling of homeserver
2019-01-26 20:10:32 +00:00
Travis Ralston
6c7eea555a
Merge pull request #1773 from matrix-org/travis/spec/rooms
...
Add a room version specification
2019-01-24 09:47:33 -07:00
Travis Ralston
052d68d83d
Merge pull request #1791 from matrix-org/travis/spec/rver-upgrades
...
Add room version upgrades
2019-01-23 19:04:24 -07:00
Travis Ralston
061f59547a
Minor wording changes
2019-01-23 09:10:14 -07:00
Hubert Chathi
5cafcd103f
Fix copyright
...
> Since this is a copy-and-paste of old text, I think the copyright year should match when the original text was written, which according to git was 2017.
Co-Authored-By: turt2live <travpc@gmail.com>
2019-01-22 21:43:32 -07:00
Travis Ralston
0dfc64a9f4
Improve wording
2019-01-22 18:11:36 -07:00
Travis Ralston
bd5e760a0d
Simplify the description for room versions
...
Instead of trying to describe maturity, stability, and recommendedness in one list we should describe what is "safe" and "unsafe" to use. The default version is just something that servers should use, and is normally going to be stable.
2019-01-22 18:02:21 -07:00
Hubert Chathi
ebe887d931
Grammar
...
Co-Authored-By: turt2live <travpc@gmail.com>
2019-01-18 09:56:04 -07:00
Matthew Hodgson
86703ef952
Merge branch 'master' into matthew/msc1779
2019-01-17 23:57:48 +00:00
Matthew Hodgson
3b86fa0e3c
incorporating delph & vdh reviews
2019-01-17 23:56:49 +00:00
Travis Ralston
ba37f2d311
prompt->advertise
2019-01-17 16:19:25 -07:00
Travis Ralston
19e94815f9
Try and improve the understanding of room versions
2019-01-17 15:13:01 -07:00
Travis Ralston
0dde2489b6
Clarify what a Mandatory room version is
2019-01-17 14:48:42 -07:00
Travis Ralston
96d754f429
promote -> prompt
2019-01-17 14:43:11 -07:00
Travis Ralston
a6f5d01586
Clarify that servers don't have to implement development/beta versions
2019-01-17 14:39:06 -07:00
Travis Ralston
2457438f1e
Encourage servers to transfer whatever they can while being open-ended
2019-01-17 13:57:02 -07:00
Travis Ralston
4e0533a5f3
Soften UX requirements
2019-01-17 13:56:48 -07:00
Travis Ralston
fcc26d247e
Merge pull request #1789 from matrix-org/travis/spec/sso-login
...
Add a generic SSO login API
2019-01-17 11:20:18 -07:00
Travis Ralston
82ee3a6035
Adjust wording for SSO introduction
2019-01-17 11:18:48 -07:00
Travis Ralston
166d4ada86
Fix room versions reference in appendices & s2s spec
2019-01-16 17:05:57 -07:00
Travis Ralston
71e6321f4d
Rework how room versions are represented
...
Versions are actually on a scale of recommendations, and are expected to be created as needed. The scale presented here (develop/beta/default/recommended/mandatory) is a more wordy version of what was previously discussed/intended for room versions - the labels aren't final and may be changed.
2019-01-16 16:57:45 -07:00
Travis Ralston
aeb524ef89
Remove CAS login and reference it against r0.4.0
...
The SSO module should cover what CAS provides, and r0.4.0 is good as a reference for how CAS could be implemented without us repeating it here.
2019-01-16 16:13:53 -07:00
Matthew Hodgson
811e65a4d1
kitsune review on when to add things to the spec
2019-01-14 13:14:43 +00:00
Matthew Hodgson
70be8393a3
clarify the technical note and guiding principles
2019-01-14 13:02:01 +00:00
Matthew Hodgson
f3085812e9
more examples; remove widget MSC ref
2019-01-12 23:51:49 +00:00
Matthew Hodgson
156488384c
add more examples for spec inclusion; add interoperability as a core value
2019-01-12 23:49:27 +00:00
Matthew Hodgson
c053996a77
add new technical guidelines to proposals.rst
...
this was originally a todo for MSC1779, but belongs better in proposals.rst
2019-01-12 23:13:40 +00:00
Travis Ralston
b85f7bb248
Add room version upgrades
...
Implements https://github.com/matrix-org/matrix-doc/issues/1501
2019-01-09 17:02:09 -07:00
Travis Ralston
d6c33ea0a5
Make CAS a subset of SSO
2019-01-09 14:41:46 -07:00
Travis Ralston
3e7a5f5ea4
Initial draft for SSO support
2019-01-09 00:09:38 -07:00
Travis Ralston
bc1303a1a0
Add a bit of rationale for WIP tags
2019-01-07 13:39:50 -07:00
Travis Ralston
671527360c
Recommend some kind of WIP tag for MSCs
2019-01-07 13:16:45 -07:00
Travis Ralston
258aba5fed
Incorporate MSC1693
...
This is largely blatant copy/paste from the MSC with some formatting done to tidy it up a bit.
2019-01-07 13:09:21 -07:00
Travis Ralston
ffe577371d
Add a room version specification
...
The "Room Specification" (or "Room Version Specification") is the specification that defines which room versions do what and are intended to be documents which speak the truth about how rooms operate under the hood.
The approach taken here is a bit different than other specifications. For starters, the specification is versioned in this project instead of relying on the matrix.org repository to track compiled HTML. This is done for a couple reasons, the first being we're still developing the v1 specification while concurrently making a v2 spec and the second being trying to reduce the reliance on matrix.org's repository for specifications.
Because the room spec is built into versions, some changes needed to be made. The `targets.yaml` now has a special syntax for indicating what version something is at, and the changelog generator can handle rendering different versions of the same changelog (as parsed from the RST). Some additional work has been put in to the changelog parsing to allow us to reference the v1 room spec as "v1" without having to sacrifice clarity in the changelog headings.
Finally, this moves the state resolution algorithms into the versioned
spec as a result of MSC1759 (https://github.com/matrix-org/matrix-doc/pull/1759 ).
Note: this does not introduce the concept of versioned schemas (tabs) that I was previously working with. There's currently no use for them, so they are shelved elsewhere.
2019-01-04 15:49:24 -07:00
Richard van der Hoff
958b956776
Merge pull request #1755 from matrix-org/erikj/event_checks
...
Document the checks made for incoming PDUs
2018-12-18 15:08:58 +01:00
Travis Ralston
35de43de61
Merge pull request #1743 from matrix-org/dbkr/add_sandbox_to_csp
...
Add 'sandbox' to recommended CSP header
2018-12-17 10:28:06 -07:00
Erik Johnston
39df8291e9
Add TODO
2018-12-14 13:23:18 +00:00
Erik Johnston
be625254b1
Fix up wording about auth rules to not lie
2018-12-14 13:23:18 +00:00
Erik Johnston
c93bdcc59c
Fix up headings
2018-12-14 13:23:18 +00:00
Richard van der Hoff
cac150d567
Fix up wording
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-14 13:13:06 +00:00
Erik Johnston
ee9c010c37
Document the checks made for incoming PDUs
2018-12-13 14:15:25 +00:00
Richard van der Hoff
fa0b4f9e13
Make the proposal labels match what happens in practice
2018-12-13 11:14:21 +00:00
J. Ryan Stinnett
d197a5761f
Clarify encrypted push rules
...
Fix `.m.rule.encrypted_room_one_to_one` by moving a condition to the right block
of the rule.
Fix `.m.rule.encrypted` to state that it applies to group rooms.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-11 16:07:01 +00:00
David Baker
e318286404
Add 'sandbox' to recommended CSP header
2018-12-10 17:33:04 +00:00
Ben Parsons
16f17855c9
link to CS API Swagger Viewer
2018-12-05 15:47:55 +00:00
Ben Parsons
43109a717f
placeholder for proposals CSS
2018-12-03 12:27:58 +00:00
Richard van der Hoff
767af87744
Merge pull request #1701 from uhoreg/e2e_export
...
document megolm session export format
2018-11-06 11:58:00 +00:00
Hubert Chathi
189725659a
clarifications and formatting fixes
2018-11-05 15:43:18 -05:00
Matthew Hodgson
179162379e
spell out that shepherd cannot be author
2018-10-27 19:34:52 +01:00
Erik Johnston
4271391214
Initial stab at documenting soft fail ( #1641 )
2018-10-26 15:18:04 +01:00
Andrew Morgan
f288facec8
Merge pull request #1697 from matrix-org/anoa/msc_update
...
The new and improved MSC process
2018-10-23 20:02:36 +02:00
Andrew Morgan
f8ffa79b56
Update and clarify proposal labels
2018-10-23 19:37:51 +02:00
Andrew Morgan
2b259c6a7b
Remove etiquette page from targets
2018-10-21 00:54:04 +02:00
Andrew Morgan
4b858a7993
DCO required for proposal and spec PR
2018-10-21 00:52:39 +02:00
Andrew Morgan
0afb122760
Clarification on FCPs
2018-10-20 23:50:26 +02:00
Andrew Morgan
f00be6b0d8
Etiquette -> guiding principles
2018-10-20 23:35:33 +02:00
Hubert Chathi
46fde9723c
document megolm session export format
2018-10-19 10:55:14 -04:00
Matthew Hodgson
c6e0a88b09
fix irc bridge example properly
2018-10-18 21:50:39 +01:00
Matthew Hodgson
7a86bc4a66
fix missing escapes on AS regexp
2018-10-18 21:48:14 +01:00
Andrew Morgan
ea21e31a0c
Merge branch 'anoa/msc_update' of github.com:matrix-org/matrix-doc into anoa/msc_update
2018-10-18 16:03:14 +02:00
Andrew Morgan
7bff4d288c
be begin -> begin
2018-10-18 15:52:28 +02:00
Travis Ralston
5a2d28e7fd
Reduce more abbreviations!
2018-10-17 18:21:16 +02:00
Travis Ralston
9625f11fd4
reduce abbreviations
2018-10-17 18:20:42 +02:00
Andrew Morgan
d487c0974f
Clarify how to get a shepherd (just ask)
2018-10-17 17:17:07 +02:00
Andrew Morgan
45c935d8d3
Clarify that MSCs aren't just issues anymore.
2018-10-17 15:35:15 +02:00
Andrew Morgan
1e939c50f5
Gather feedback
2018-10-17 14:49:01 +02:00
Andrew Morgan
148f7d7b33
Minor proposal updates are allowed
2018-10-17 14:34:57 +02:00
Andrew Morgan
5a1e735921
Fix sign off bullet
2018-10-16 01:21:14 +02:00
Andrew Morgan
aeea060bb8
Specify where to find the MSC ID
2018-10-16 01:06:44 +02:00
Andrew Morgan
7753957d04
remove ambiguity
2018-10-16 01:04:54 +02:00
Andrew Morgan
2f0025c7a7
Fix up wording in proposal etiquette
2018-10-16 00:57:11 +02:00
Andrew Morgan
35c924308c
core team -> Core Team
2018-10-16 00:57:08 +02:00
Andrew Morgan
8121bef771
Introduce the spec core team
2018-10-16 00:44:05 +02:00
Andrew Morgan
c1ecb9e324
Fix up table with title and add corresponding GitHub labels
2018-10-16 00:17:08 +02:00
Andrew Morgan
889b46898c
Move proposal etiquette to a separate document.
2018-10-16 00:07:16 +02:00
Andrew Morgan
49d017bdd5
your proposal -> the proposal
2018-10-15 23:51:28 +02:00
Andrew Morgan
fb4c50ec8a
No need to redefine MSC
2018-10-15 23:37:41 +02:00
Andrew Morgan
604091380f
Attempt to fix contributing link
2018-10-15 16:41:44 +02:00
Andrew Morgan
b3f90f5825
proposal passed = spec pr missing
2018-10-15 16:38:48 +02:00
Andrew Morgan
873641e4bc
Proposal Created and In Review is a single phase
2018-10-15 16:34:41 +02:00
Andrew Morgan
11dbd5b56a
Proposal WIP -> drafting/feedback gathering
2018-10-15 16:30:33 +02:00
Andrew Morgan
5ae3b50c6b
Require link to implementation
2018-10-15 16:18:20 +02:00
Andrew Morgan
f1d71bd6c4
Less complicated wording
2018-10-15 16:09:04 +02:00
Andrew Morgan
0e9ad9e95d
Fix wording, fix earlier capatilization
2018-10-15 16:05:09 +02:00
Andrew Morgan
f769084570
Put it in the proposals dir!
2018-10-15 15:54:28 +02:00
Andrew Morgan
67146e4bec
MSC ALL the changes
2018-10-15 15:52:33 +02:00
Andrew Morgan
9432ed76d7
first-draft -> first draft
2018-10-15 15:51:54 +02:00
Andrew Morgan
80d1d4af9c
Fix capatilization
2018-10-15 15:48:55 +02:00
Andrew Morgan
d2e827e0c6
Note about earlier MSC process
2018-10-15 15:46:26 +02:00
Andrew Morgan
764c63f3e8
Add proposal template
2018-10-15 15:29:40 +02:00
Andrew Morgan
a3144e6959
Move to the new and improved MSC process
2018-10-15 02:33:15 +02:00
Matthew Hodgson
6dab4b28f8
Merge pull request #1648 from matrix-org/matthew/device_list_update
...
document device list synchronisation over federation.
2018-09-03 16:54:36 +01:00
Matthew Hodgson
334c69bcda
wording fix
2018-09-03 16:53:39 +01:00
Matthew Hodgson
ccbc88ee5d
reword to spell out to when device list updates should be sent
2018-09-03 16:49:36 +01:00
Matthew Hodgson
bcd48ebbec
Merge pull request #1610 from uhoreg/reloaded
...
document new state resolution algorithm
2018-09-02 23:53:08 +01:00
Konstantinos Sideris
192a6c2ab9
Use example.org on examples instead of domain.com which is a real domain
...
Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
2018-09-02 17:58:21 +03:00
Matthew Hodgson
e9e3afbd34
clarify who servers should send m.device_list_update EDUs to
2018-09-02 13:00:29 +01:00
Matthew Hodgson
928fc5cbe5
incorporate review
2018-09-01 03:08:53 +01:00
Matthew Hodgson
42b11e096f
Review
2018-09-01 02:48:37 +01:00
Matthew Hodgson
d25f4412d4
improve wording
2018-09-01 02:46:05 +01:00
Matthew Hodgson
db302b66ca
revert example which was corect first time; fix rst
2018-09-01 02:44:53 +01:00
Matthew Hodgson
0f9a23c471
swaggerify to-device
2018-09-01 02:37:31 +01:00
Matthew Hodgson
0afdcc59ea
spell out stream_id and fix todo
2018-09-01 02:10:45 +01:00
Matthew Hodgson
30d56691b1
document device list synchronisation over federation.
...
untested
closes MSC1212
2018-09-01 01:48:02 +01:00
Travis Ralston
735de03e07
Add r0 version links
...
These were missed in the release process.
2018-08-31 17:40:32 -06:00
Travis Ralston
bb2835651f
Merge pull request #1637 from turt2live/travis/c2s/clarify-errors
...
List known client-server error codes; Clarify priority of error codes vs http status code
2018-08-31 16:42:43 -06:00
Travis Ralston
00578547c0
Merge pull request #1644 from matrix-org/rav/is_token_grammar
...
Spec grammars for IS things
2018-08-31 16:05:23 -06:00
Travis Ralston
f3825c5827
A couple more stragglers
2018-08-31 15:55:07 -06:00
Travis Ralston
218b86d6e8
Hopefully the last one
2018-08-31 15:48:41 -06:00
Richard van der Hoff
79974b152c
s/identity service/identity server
2018-08-31 22:44:36 +01:00
Richard van der Hoff
a544b68298
Merge branch 'master' into rav/is_token_grammar
2018-08-31 22:37:04 +01:00
Travis Ralston
7d34995ece
It's actually an "identity server implementing the Identity Service API"
...
Also add a note about appservices being special.
2018-08-31 15:35:32 -06:00
Travis Ralston
7ac76fa27c
Actually we're going with "identity server" afterall
2018-08-31 15:04:00 -06:00
Travis Ralston
ec248b436f
Identity Service is lowercase
2018-08-31 15:04:00 -06:00
Travis Ralston
cc0badaaa1
Fix all naming cases of "identity service"
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1396
Includes some "homeserver" fixes too. This commit does not include historical documentation or notes.
2018-08-31 15:04:00 -06:00
Travis Ralston
108c623557
Merge pull request #1635 from turt2live/travis/c2s/read-markers
...
Add read markers
2018-08-31 14:47:39 -06:00
Travis Ralston
835f5de387
Generalize the token name even more
2018-08-31 14:22:07 -06:00
Richard van der Hoff
dced3d5707
Notes on the format of IS session IDs and tokens
2018-08-31 21:06:51 +01:00
Travis Ralston
f299fe023a
English
2018-08-31 12:51:31 -06:00
Travis Ralston
f4c5c209f3
Generalize language for pagination
...
Previously the section was very strict in what pagination was, however this isn't the reality for the matrix specification. Several endpoints have their own pagination naming conventions and do not follow those mandated by this section.
This commit generalizes the language to cover those endpoints while also describing how pagination works. In particular, it describes the rough API shape to expect and how to deal with the responses.
This commit also removes the `M_BAD_PAGINATION` error as it is not used in the real world. Homeservers are instead encouraged to use the standard `M_INVALID_PARAM` or similar error code.
Fixes https://github.com/matrix-org/matrix-doc/issues/610
Fixes https://github.com/matrix-org/matrix-doc/issues/1523
2018-08-31 12:36:08 -06:00
Hubert Chathi
c0dd7e0025
Merge pull request #1420 from Zil0/encrypted_attach
...
Document encrypted attachments
2018-08-31 13:33:05 -04:00
Travis Ralston
4b9fb99644
Take out unhelpful example
2018-08-31 11:18:54 -06:00
Travis Ralston
3146fc339a
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-errors
2018-08-31 11:15:03 -06:00
Travis Ralston
f6d9e53f5c
Clarify that homeserver must reject clients from setting m.fully_read
2018-08-31 11:13:32 -06:00
Travis Ralston
2e8151999e
Clarify that read markers are fully read markers
2018-08-31 11:13:19 -06:00
Hubert Chathi
f1f32d3a15
add more clarifications
2018-08-31 12:59:57 -04:00
Travis Ralston
679ddabb53
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/read-markers
2018-08-31 10:34:19 -06:00
Travis Ralston
567843e043
Add additional clarity to how rich replies are structured and used
2018-08-31 10:20:26 -06:00
Hubert Chathi
e3daf10bb9
refactor encrypted file schema as "Extension to m.message"
2018-08-31 12:11:27 -04:00
Travis Ralston
9004be7bda
Merge remote matrix-org/master
2018-08-31 10:08:05 -06:00
Travis Ralston
f013b7ef03
Merge pull request #1631 from turt2live/travis/general/unstable-warning
...
Render a warning if the spec is unstable
2018-08-31 09:50:37 -06:00
Travis Ralston
ab00630ebc
Don't include a second unstable warning in the s2s spec for now
2018-08-31 09:49:24 -06:00
Travis Ralston
f72c821be4
Merge pull request #1619 from turt2live/travis/c2s/local-echo
...
Reference that transaction IDs may be used to echo
2018-08-31 09:48:02 -06:00
Travis Ralston
136ba15eb2
Merge pull request #1605 from turt2live/travis/c2s/clarify-html-again
...
Mention that clients should not be producing invalid HTML
2018-08-31 08:41:29 -06:00
Travis Ralston
38ae166e9d
Merge pull request #1505 from turt2live/travis/general/3pid_invite
...
Clarify how third party invites work
2018-08-31 08:38:40 -06:00
Travis Ralston
afa16f1e4e
Merge pull request #1606 from turt2live/travis/c2s/room-tags
...
Update the room tagging documentation
2018-08-31 08:36:40 -06:00
Travis Ralston
c127eed7e7
Merge pull request #1600 from turt2live/travis/c2s/media-csp
...
Specify the minimum CSP for media
2018-08-31 08:32:33 -06:00
Travis Ralston
9646d99c9e
Merge pull request #1602 from turt2live/travis/general/redactions
...
Add the other fields the server is expected to keep on events
2018-08-31 08:31:50 -06:00
Erik Johnston
080845ac1c
Add link to previous section
2018-08-31 12:00:38 +01:00
Erik Johnston
bbca5ce43a
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/limit_auth_events
2018-08-31 11:52:36 +01:00
Erik Johnston
b6ed25e4b4
Fix incorrect indent
2018-08-31 11:32:29 +01:00
Erik Johnston
f3a13eed76
Merge pull request #1593 from matrix-org/erikj/auth_events
...
Update rules on which events to add to `auth_events`
2018-08-31 11:27:03 +01:00
Erik Johnston
86891ca7e4
Merge pull request #1625 from matrix-org/erikj/auth_rejections
...
Explain how to handle rejected events
2018-08-31 11:26:57 +01:00
Erik Johnston
d91dc6fbf6
Fixup
2018-08-31 11:20:26 +01:00
Erik Johnston
4d653748d6
Add note back in
2018-08-31 11:17:58 +01:00
Erik Johnston
8e6c8ba59e
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/spec_3pid_ruls
2018-08-31 11:13:13 +01:00
Erik Johnston
a1aedb386a
Actually use proper sentences like a proper adult
2018-08-31 11:04:49 +01:00
Erik Johnston
0adfd1ebb0
Merge pull request #1591 from matrix-org/erikj/fixup_auth_rules
...
Fix up auth rules
2018-08-31 11:01:12 +01:00
Erik Johnston
d63184ebac
Fixup
2018-08-31 10:59:42 +01:00
Erik Johnston
3c53e1910d
Fixup
2018-08-31 10:51:59 +01:00
Erik Johnston
1a45bc4a85
Reword
2018-08-31 10:24:51 +01:00
Erik Johnston
59f86ec8f2
Reindent as RST requires sublists to be three spaces
2018-08-31 10:07:59 +01:00
Erik Johnston
f4706c8889
Require creator field
2018-08-31 10:06:26 +01:00
Erik Johnston
f3aea32a24
Be consistent with 'If..., reject'
2018-08-31 09:59:45 +01:00
Erik Johnston
6c8a45c165
Full stops
2018-08-31 09:57:00 +01:00
Erik Johnston
ebb044674f
Remove duplicated explanation about event rejection
2018-08-31 09:51:17 +01:00
Travis Ralston
d57b40d0cc
Clarify how the client should treat errors
...
This is based on observation and rough interpretation and may need additional review from people.
Fixes https://github.com/matrix-org/matrix-doc/issues/1188
2018-08-30 23:06:32 -06:00
Travis Ralston
e6adf9f6b9
Document known client-server error codes
...
Covers part of https://github.com/matrix-org/matrix-doc/issues/603 (updating all the endpoints is being done as a separate PR/commit).
Reference: 74854a9719/synapse/api/errors.py (L30-L61)
2018-08-30 23:05:51 -06:00
Travis Ralston
caaa688e37
Fix links to client-server spec
2018-08-30 16:28:26 -06:00
Travis Ralston
219b27b182
Merge remote matrix-org/master
2018-08-30 16:27:20 -06:00
Travis Ralston
f923d08078
Add read markers
...
This is the spec for https://github.com/matrix-org/matrix-doc/issues/910
Fixes https://github.com/matrix-org/matrix-doc/issues/910
Some reverse engineering was required to work out the complete details as to how this works. In particular, the 405 for setting account data and the behaviour of m.read.
References:
* 405 for account data: d69decd5c7/synapse/rest/client/v2_alpha/account_data.py (L85-L90)
* m.read behaviour: d69decd5c7/synapse/rest/client/v2_alpha/read_marker.py (L45-L52)
2018-08-30 16:21:31 -06:00
Richard van der Hoff
0f84c69805
Merge branch 'master' into rav/clarify_event_signing
2018-08-30 22:48:56 +01:00
Travis Ralston
98a445890c
Render a warning if the spec is unstable
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1499
This is done by using magic variables in the RST. The magic variables are generated based on the substitutions available, making them available for use at build-time.
Magic variables were chosen because it allows people to continue working on the spec and release process without having to worry about removing a chunk of text from the top of the file. Originally, this was attempted by using jinja2 if-statements, however the substitutions are replaced *after* the template is executed, so the condition would never match.
The format of the variable is to make the templating happy. Using colons or percent signs results in the templator thinking something else is going on, and then complaining about format.
2018-08-30 15:05:50 -06:00
Travis Ralston
d57b977a55
Merge branch 'm-master' into travis/general/3pid_invite
2018-08-30 15:01:31 -06:00
Travis Ralston
1f6499d563
Fix typo
2018-08-30 15:01:20 -06:00
Travis Ralston
356626845c
Remove unhelpful arrow from the 3rd party invite sequence dance
...
This doesn't add anything in terms of clarity.
2018-08-30 15:00:52 -06:00
Travis Ralston
5e6a2c30a2
Comment out the part where identity services can revoke their keys
...
They can't because otherwise 3rd party invites can be rejected by homeservers, as per https://github.com/matrix-org/matrix-doc/issues/1633
2018-08-30 15:00:14 -06:00
Travis Ralston
cee0a5ac7b
Merge pull request #1557 from turt2live/travis/general/r0-prep
...
Prepare the identity service and server-server APIs for r0
2018-08-30 14:46:35 -06:00
Travis Ralston
32cde24bcf
Fix server-server link in IS spec
2018-08-30 12:26:24 -06:00
Travis Ralston
e82c22b060
Merge pull request #1615 from turt2live/travis/is/touchups
...
Touch up more of the identity service specification
2018-08-30 12:23:25 -06:00
Travis Ralston
b8f2c721dc
Clarify which attributes should be valid
2018-08-30 12:22:50 -06:00
Travis Ralston
2d18b0d2d8
Merge remote-tracking branch 'matrix-org/master' into travis/c2s/clarify-html-again
2018-08-30 12:21:38 -06:00
Travis Ralston
f09db16027
Merge remote-tracking branch 'matrix-org/master' into travis/s2s/key-mgmt
2018-08-30 12:19:59 -06:00
Travis Ralston
2753d24302
Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep
2018-08-30 12:17:09 -06:00
Travis Ralston
440841d1ff
Recommend a CSP rather than require it.
2018-08-30 12:13:21 -06:00
Travis Ralston
70f72b5b3b
Merge pull request #1628 from turt2live/travis/as/external_url
...
Clarify how external_url is supposed to work
2018-08-30 11:12:39 -06:00
Travis Ralston
cc1e496287
Merge pull request #1629 from turt2live/travis/as/route-versions
...
Version all appservice endpoints and provide a fallback
2018-08-30 11:11:25 -06:00
Travis Ralston
326ff6b1a1
Merge branch 'master' into travis/as/external_url
2018-08-30 11:09:15 -06:00
Travis Ralston
0f2e01f5b5
Merge pull request #1555 from turt2live/travis/as/cleanup
...
Application service spec cleanup; Security definitions; r0 prep
2018-08-30 11:08:10 -06:00
Travis Ralston
1a3f112337
Clarify that the external_url is unsafe
2018-08-30 11:07:09 -06:00
Travis Ralston
be5c566028
Version all appservice endpoints and provide a fallback
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1616
2018-08-30 11:03:42 -06:00
Travis Ralston
a48f7b9278
Clarify how external_url is supposed to work
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1624
2018-08-30 10:49:40 -06:00
Travis Ralston
05b017276c
Don't accidentally limit application services to one homeserver
2018-08-30 10:23:12 -06:00
Travis Ralston
ab14f33060
Add link to the client-server ACLs module
2018-08-30 10:11:37 -06:00
Erik Johnston
5c2b8e3569
Explain how to handle rejeceted events
2018-08-30 17:03:16 +01:00
Hubert Chathi
db644ca522
add some clarifications
2018-08-30 11:24:39 -04:00
Travis Ralston
56f6640c07
Merge pull request #1618 from turt2live/travis/c2s/initalsync
...
Remove references to initialSync from account data and receipts module
2018-08-30 07:44:08 -06:00
Richard van der Hoff
55c4307f12
Rewrite the section on signing events
...
... for clarity and de-duplication. And to say a bit about validating the
signatures.
2018-08-30 14:37:24 +01:00
Richard van der Hoff
6ba50fe2f6
Merge pull request #1588 from matrix-org/rav/fix_server_name
...
Specify that server names cannot be %-encoded
2018-08-30 10:48:06 +01:00
Travis Ralston
bd93481013
Reference that transaction IDs may be used to echo
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1462
2018-08-29 23:18:10 -06:00
Travis Ralston
78487a01ec
Remove references to initialSync from account data and receipts module
...
Fixes https://github.com/matrix-org/matrix-doc/issues/695
Note: This commit leaves the /join endpoints alone because they say "and /sync" rather than just initialSync
2018-08-29 23:11:00 -06:00
Travis Ralston
e227095fb4
Add rich replies
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1234
The notable parts of this are:
* The titles go to insane levels. Rich replies are fairly complex and need some splitting apart to be understandable.
* The allowed HTML tags now have an exception for `<mx-reply>`
Please note that the event example is intended to be fixed by a PR that fixes all event examples.
2018-08-29 22:58:11 -06:00
Travis Ralston
a5c3924492
Merge remote matrix-org/master
2018-08-29 21:28:24 -06:00
Hubert Chathi
4230e375fa
Merge pull request #1465 from Zil0/key_sharing
...
Document key sharing events
2018-08-29 23:05:17 -04:00
Travis Ralston
dc602b74d2
Reference the server-server specification for /onbind
2018-08-29 21:02:35 -06:00
Travis Ralston
0387da51e2
Clarify how sessions work when establishing associations
2018-08-29 21:02:28 -06:00
Travis Ralston
039cefdbea
Say that identity services should be nice to web browsers (CORS/OPTIONS)
2018-08-29 21:02:24 -06:00
Travis Ralston
bbba7dedd6
Clean up identity service RST
...
* Title casing
* s/identity server/identity service
* Rough column limit enforcement
* Add some links (used by future commits)
2018-08-29 21:02:19 -06:00
Hubert Chathi
0130620cc1
Merge pull request #1596 from uhoreg/e2e_sessions
...
specify how to handle multiple olm sessions with the same device
2018-08-29 22:45:38 -04:00
Hubert Chathi
9b94e588e6
document new state resolution algorithm
2018-08-29 21:39:49 -04:00
Travis Ralston
c7a228bf7b
Don't make the major version a variable
...
We are likely to want to maintain v1 when we release a v2, so we'll avoid a variable for now.
2018-08-29 19:32:52 -06:00
Travis Ralston
e7a69a6a6d
Merge remote-tracking branch 'matrix-org/master' into travis/general/r0-prep
2018-08-29 19:29:42 -06:00
Travis Ralston
a46783eb24
Revert "Take out the reference to the current version from the changelog"
...
This reverts commit 2a20c11467
.
2018-08-29 18:10:03 -06:00
Travis Ralston
2a20c11467
Take out the reference to the current version from the changelog
2018-08-29 17:54:48 -06:00
Travis Ralston
2ab2f91088
Merge remote-tracking branch 'matrix-org/master' into travis/releases/push-gateway/r0.1.0
2018-08-29 17:54:34 -06:00
Richard van der Hoff
196159be91
We should include the Host header if the port was explicit.
2018-08-29 22:18:14 +01:00
Travis Ralston
abb91508be
Merge pull request #1556 from turt2live/travis/is/cleanup
...
Identity Service API cleanup
2018-08-29 15:16:53 -06:00
Travis Ralston
c03f2f8d79
Minor touchups to the room tagging API
...
Fixes some of https://github.com/matrix-org/matrix-doc/issues/1565
2018-08-29 14:53:55 -06:00
Travis Ralston
f2d02c9559
Take out device management section for now
...
This will be handled by the implementation of https://github.com/matrix-org/matrix-doc/issues/1212
2018-08-29 14:37:30 -06:00
Travis Ralston
8950f0b2cc
Spelling
2018-08-29 14:36:43 -06:00
Travis Ralston
2234e0b097
Mention that clients should not be producing invalid HTML
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1595
2018-08-29 12:38:15 -06:00
Matthew Hodgson
8e88d82a4b
fix typo in anchor. fixes #1603
2018-08-29 19:15:05 +01:00
Travis Ralston
348b549f9f
Add the other fields the server is expected to keep on events
...
Fixes https://github.com/matrix-org/matrix-doc/issues/839
Reference: d69decd5c7/synapse/events/utils.py (L44-L91)
2018-08-29 11:19:37 -06:00
Travis Ralston
ec20c43220
Specify the minimum CSP for media
...
Fixes https://github.com/matrix-org/matrix-doc/issues/1066
2018-08-29 10:55:34 -06:00
Travis Ralston
73feee5d73
Merge pull request #1586 from turt2live/travis/as/comment-ts-section
...
Comment out the timestamp massaging section for now
2018-08-29 10:10:36 -06:00
Travis Ralston
25b34e1d7b
Mention that ts massaging was in a draft, but not in the release
2018-08-29 09:55:43 -06:00
Travis Ralston
39ef845a53
Merge pull request #1547 from turt2live/travis/c2s/pills
...
Document how mentions (pills) work
2018-08-29 09:13:02 -06:00
Hubert Chathi
5019fb7c49
Merge pull request #1359 from uhoreg/well-known
...
.well-known discovery
2018-08-29 10:40:54 -04:00
Hubert Chathi
688c8ebcd3
specify how to handle multiple olm sessions with the same device
2018-08-29 10:17:20 -04:00
Erik Johnston
d921b81c70
Reject events with superfluous auth_events entries
2018-08-29 14:17:52 +01:00