Commit Graph

3714 Commits (6421582bf2f29f766a151f93264126c3f69f4139)
 

Author SHA1 Message Date
Andrew Morgan d9135ef902
Merge pull request #1598 from matrix-org/rav/proposals/id_grammar
MSC 1597: Better spec for matrix identifiers
7 years ago
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
7 years ago
Andrew Morgan e7c6670c06
Merge pull request #1759 from matrix-org/erikj/rooms_v2
Room v2 proposal
7 years ago
Kitsune Ral 8c80669d7a Add the paragraph for sync.yaml forgotten in the previous commit 7 years ago
Richard van der Hoff 82f3b8a95a switch to GET 7 years ago
Richard van der Hoff 68ac2172ba Give examples of applications 7 years ago
Travis Ralston f767227e31
Merge pull request #1744 from matrix-org/travis/m.presence
Add missing status_msg to m.presence schema and example
7 years ago
Richard van der Hoff 958b956776
Merge pull request #1755 from matrix-org/erikj/event_checks
Document the checks made for incoming PDUs
7 years ago
Erik Johnston 8fb2bd2927 Fix typo 7 years ago
Travis Ralston 35de43de61
Merge pull request #1743 from matrix-org/dbkr/add_sandbox_to_csp
Add 'sandbox' to recommended CSP header
7 years ago
Erik Johnston 23c7533f8d Room v2 proposal 7 years ago
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)
7 years ago
Richard van der Hoff a451e007a4 Fix labels in proposals script 7 years ago
Erik Johnston 39df8291e9 Add TODO 7 years ago
Erik Johnston be625254b1 Fix up wording about auth rules to not lie 7 years ago
Erik Johnston c93bdcc59c Fix up headings 7 years ago
Richard van der Hoff cac150d567
Fix up wording
Co-Authored-By: erikjohnston <erikj@jki.re>
7 years ago
Erik Johnston 39f7c77971 Add dot for image file 7 years ago
Richard van der Hoff b95d5724a4 Add suggestion of returning a 401 for non-/login requests 7 years ago
Erik Johnston 48d271e58c Clarifications 7 years ago
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
7 years ago
Erik Johnston ee9c010c37 Document the checks made for incoming PDUs 7 years ago
Erik Johnston 463c71af82 Add a note about the examples 7 years ago
Erik Johnston b695eb0d17 Clarify example 7 years ago
Richard van der Hoff fa0b4f9e13 Make the proposal labels match what happens in practice 7 years ago
Erik Johnston bc9d205079 Make lines bold 7 years ago
Richard van der Hoff 0e156faaf1 MSC1753: client-server capabilities API 7 years ago
Travis Ralston 0f7e285f15
Merge pull request #1751 from QMatrixClient/kitsune/contains_url_default
Describe the actual implication of omitting contains_url
7 years ago
Kitsune Ral 1639f27ec5 Describe the actual implication of omitting contains_url
Closes #1750

Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
7 years ago
Travis Ralston f7c7a74092 Revert "Merge pull request #1747 from matrix-org/revert-1730-rav/proposal/cs_api_in_login"
This reverts commit e30543a3fe.
7 years ago
Travis Ralston 828e3f83bd Merge branch 'm.org-master' into rav/proposal/cs_api_in_login 7 years ago
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"
7 years ago
Travis Ralston 6dab287708
Revert "MSC1730: Mechanism for redirecting to an alternative server during login" 7 years ago
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
7 years ago
Travis Ralston 9aff2583c5
Merge pull request #1745 from jryans/encrypted-rule-clarify
Clarify encrypted push rules
7 years ago
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>
7 years ago
Erik Johnston a8bd2f32fd Update example 7 years ago
Erik Johnston 8a3e7b751c Add missing apostrophe 7 years ago
Richard van der Hoff 7782781442
Update wording to be betterer
Co-Authored-By: erikjohnston <erikj@jki.re>
7 years ago
Richard van der Hoff 612d8a66ef
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
7 years ago
Richard van der Hoff f06455479d
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
7 years ago
Richard van der Hoff 539ca4cf15
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
7 years ago
Richard van der Hoff c581c6132e
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
7 years ago
Richard van der Hoff eaaf36edf7
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
7 years ago
Kitsune Ral 6d0def8b4c Spec lazy_load_members and include_redundant_members
Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
7 years ago
Travis Ralston 7461cd7f68
Add changelog 7 years ago
Travis Ralston 1268b421ec
Update the m.presence schema to include status_msg 7 years ago
Travis Ralston f78bb72be8
Add status_msg to m.presence example 7 years ago
David Baker e318286404 Add 'sandbox' to recommended CSP header 7 years ago
Erik Johnston 6c9a433805 Add example of rejected events getting into state 7 years ago