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
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
8f1291a3e7
Merge pull request #1758 from QMatrixClient/kitsune/lazy-loading
...
Spec lazy_load_members and include_redundant_members
2018-12-24 10:29:36 +01:00
Andrew Morgan
d9135ef902
Merge pull request #1598 from matrix-org/rav/proposals/id_grammar
...
MSC 1597: Better spec for matrix identifiers
2018-12-23 17:07:11 +01:00
Andrew Morgan
f714aaadd0
Merge pull request #1693 from matrix-org/erikj/state_res_rejections
...
MSC1693: Specify how to handle rejected events in new state res
2018-12-23 17:06:34 +01:00
Andrew Morgan
e7c6670c06
Merge pull request #1759 from matrix-org/erikj/rooms_v2
...
Room v2 proposal
2018-12-23 17:05:39 +01:00
Kitsune Ral
8c80669d7a
Add the paragraph for sync.yaml forgotten in the previous commit
2018-12-23 18:58:44 +09:00
Travis Ralston
f767227e31
Merge pull request #1744 from matrix-org/travis/m.presence
...
Add missing status_msg to m.presence schema and example
2018-12-18 09:41:07 -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
Erik Johnston
8fb2bd2927
Fix typo
2018-12-18 09:47:32 +00: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
23c7533f8d
Room v2 proposal
2018-12-17 15:35:54 +00:00
Richard van der Hoff
3fda4a3989
Merge pull request #1748 from matrix-org/rav/proposal/cs_api_in_login
...
MSC1730: Mechanism for redirecting to an alternative server during login (version 2)
2018-12-17 13:10:13 +01:00
Richard van der Hoff
a451e007a4
Fix labels in proposals script
2018-12-17 09:49:47 +00: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
39f7c77971
Add dot for image file
2018-12-14 13:09:25 +00:00
Richard van der Hoff
b95d5724a4
Add suggestion of returning a 401 for non-/login requests
2018-12-14 12:03:19 +00:00
Erik Johnston
48d271e58c
Clarifications
2018-12-14 11:22:32 +00:00
Richard van der Hoff
7fa2db4fe8
Merge pull request #1754 from matrix-org/rav/fix_proposal_states
...
Make the proposal labels match what happens in practice
2018-12-14 00:07:48 +01:00
Erik Johnston
ee9c010c37
Document the checks made for incoming PDUs
2018-12-13 14:15:25 +00:00
Erik Johnston
463c71af82
Add a note about the examples
2018-12-13 11:31:39 +00:00
Erik Johnston
b695eb0d17
Clarify example
2018-12-13 11:20:19 +00:00
Richard van der Hoff
fa0b4f9e13
Make the proposal labels match what happens in practice
2018-12-13 11:14:21 +00:00
Erik Johnston
bc9d205079
Make lines bold
2018-12-13 11:13:14 +00:00
Travis Ralston
0f7e285f15
Merge pull request #1751 from QMatrixClient/kitsune/contains_url_default
...
Describe the actual implication of omitting contains_url
2018-12-12 09:52:51 -07:00
Kitsune Ral
1639f27ec5
Describe the actual implication of omitting contains_url
...
Closes #1750
Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
2018-12-12 17:07:06 +09:00
Travis Ralston
f7c7a74092
Revert "Merge pull request #1747 from matrix-org/revert-1730-rav/proposal/cs_api_in_login"
...
This reverts commit e30543a3fe
.
2018-12-11 15:52:06 -07:00
Travis Ralston
828e3f83bd
Merge branch 'm.org-master' into rav/proposal/cs_api_in_login
2018-12-11 15:52:00 -07:00
Travis Ralston
e30543a3fe
Merge pull request #1747 from matrix-org/revert-1730-rav/proposal/cs_api_in_login
...
Revert "MSC1730: Mechanism for redirecting to an alternative server during login"
2018-12-11 15:50:59 -07:00
Travis Ralston
6dab287708
Revert "MSC1730: Mechanism for redirecting to an alternative server during login"
2018-12-11 15:49:24 -07:00
Travis Ralston
a4bc79025b
Merge pull request #1730 from matrix-org/rav/proposal/cs_api_in_login
...
MSC1730: Mechanism for redirecting to an alternative server during login
2018-12-11 14:25:03 -07:00
Travis Ralston
9aff2583c5
Merge pull request #1745 from jryans/encrypted-rule-clarify
...
Clarify encrypted push rules
2018-12-11 09:28:29 -07: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
Erik Johnston
a8bd2f32fd
Update example
2018-12-11 10:37:31 +00:00
Erik Johnston
8a3e7b751c
Add missing apostrophe
2018-12-11 10:33:02 +00:00
Richard van der Hoff
7782781442
Update wording to be betterer
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:13:45 +00:00
Richard van der Hoff
612d8a66ef
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:52 +00:00
Richard van der Hoff
f06455479d
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:39 +00:00
Richard van der Hoff
539ca4cf15
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:29 +00:00
Richard van der Hoff
c581c6132e
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:12:18 +00:00
Richard van der Hoff
eaaf36edf7
Update proposals/1442-state-resolution.md
...
Co-Authored-By: erikjohnston <erikj@jki.re>
2018-12-11 10:11:55 +00:00
Kitsune Ral
6d0def8b4c
Spec lazy_load_members and include_redundant_members
...
Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
2018-12-11 19:04:15 +09:00
Travis Ralston
7461cd7f68
Add changelog
2018-12-10 15:46:02 -07:00
Travis Ralston
1268b421ec
Update the m.presence schema to include status_msg
2018-12-10 15:44:01 -07:00
Travis Ralston
f78bb72be8
Add status_msg to m.presence example
2018-12-10 15:41:41 -07:00
David Baker
e318286404
Add 'sandbox' to recommended CSP header
2018-12-10 17:33:04 +00:00