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

3622 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Erik Johnston 6c9a433805 Add example of rejected events getting into state 2018-12-10 16:27:45 +00:00
Erik Johnston 55ebf7dc32
MSC 1466 - Soft Logout (#1467) 2018-12-10 09:59:15 +00:00
Richard van der Hoff 6f7b3198fb fix list which got lost in merge 2018-12-06 16:36:41 +00:00
Richard van der Hoff 275e516f93 Rename svg file to bust cache 
github is serving up the old file for some reason
 2018-12-06 16:32:55 +00:00
Richard van der Hoff a9c4ea690d Merge branch 'rav/msc1730/work' into rav/proposal/cs_api_in_login 2018-12-06 16:29:16 +00:00
Richard van der Hoff 9c9c5a8c65 more alternatives 2018-12-06 16:06:17 +00:00
Richard van der Hoff 57421cc59b attempt to clarify MSC1730 2018-12-06 12:48:12 +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
Andrew Morgan 1e9a7d968b
Merge pull request #1721 from matrix-org/rav/proposal/sso_login 
MSC1721: Rename m.login.cas to m.login.sso
 2018-12-01 20:22:06 +01:00
Richard van der Hoff 6fa754c447
Tradeoffs->rejected solutions 
because apparently this was somehow confusing
 2018-11-26 23:37:10 +00:00
Richard van der Hoff 94d83c0483 Update based on feedback 
Mostly this is clarification of the problem domain; it also updates some of the
discussion points to reflect my current thinking.
 2018-11-26 18:36:07 +00:00
Travis Ralston 6dd2120337
Merge pull request #1729 from QMatrixClient/kitsune/filling-spec-gaps 
joining.yaml: add missing response schema details
 2018-11-25 20:11:59 -07:00
Richard van der Hoff a39189c08b Update proposal 
Notes on problems, workaround, and another alternative
 2018-11-24 00:28:10 +00:00
Richard van der Hoff 6f2c2b2c7e MSC1730: Mechanism for redirecting to an alternative server during login 2018-11-23 12:51:45 +00:00
Kitsune Ral 6782b6399f
Update according to the comments 2018-11-23 17:54:00 +09:00
Richard van der Hoff b5a82a5eb1
no need to rename ticket endpoint 2018-11-22 23:04:43 +00:00
Kitsune Ral 96d7eed1c6 joining.yaml: add missing response schema details 2018-11-17 19:21:08 +09:00
Richard van der Hoff 0c4b09305e Proposal to rename m.login.cas to m.login.sso 2018-11-15 12:34:53 +00:00
Travis Ralston ef33c175b5
Merge pull request #1718 from uhoreg/fix_proposal_heading 
make heading level for "Security considerations" match the other headings
 2018-11-13 10:25:18 -07:00
Hubert Chathi 58091fa3fe make heading level for "Security considerations" match the other headings 
as much as I like that "Security considerations" gets to be bigger than the
other headers, we should probably make it consistent
 2018-11-13 11:58:31 -05:00
Richard van der Hoff 6a3d68b7ed
Merge pull request #1712 from matrix-org/rav/update_issue_list 
Change the labels the proposals list looks for
 2018-11-08 11:57:17 +00:00
Richard van der Hoff 926cfe4f75 Change the labels the proposals list looks for 
This is slightly complicated by the `proposal-wip` label going away, and
becoming implicit
 2018-11-07 15:52:31 +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
Hubert Chathi 1be3bd602a add changelog 2018-11-05 15:41:41 -05:00
Erik Johnston a80ff2f69f Don't use rejected auth events 2018-11-05 09:45:11 +00:00
Erik Johnston b8a8d132b2 Note why convergence is desirable 2018-11-01 11:41:38 +00:00
Erik Johnston a6aab378f5 Typo 2018-10-31 15:26:54 +00:00
Erik Johnston 1f1ba28629 ACTUALLY! Let's just accept rejected events, because what's the worst that can happen?! 2018-10-31 15:26:12 +00:00
Erik Johnston 25fb09b991 Fix up formatting 2018-10-30 13:42:18 +00:00
Erik Johnston 40d943f584 Clarify 'auth difference' definition 2018-10-30 11:03:07 +00:00