Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-24 18:08:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3607 commits 30 branches 42 tags 32 MiB
Commit graph

3607 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Travis Ralston 510468a3b1 Changelog 2019-01-09 15:31:04 -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
Matthew Hodgson bd72ecfa58 oops, wrong branch 2019-01-07 02:43:21 +00:00
Matthew Hodgson c5de71843a MSC1779: Open Governance for Matrix.org 2019-01-07 02:42:03 +00: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