Commit Graph

3687 Commits (bf2b6e6daac2fc7cd7240050737cf372ed6ac60b)
 

Author SHA1 Message Date
Travis Ralston 0f7e285f15
Merge pull request #1751 from QMatrixClient/kitsune/contains_url_default
Describe the actual implication of omitting contains_url
6 years ago
Kitsune Ral 1639f27ec5 Describe the actual implication of omitting contains_url
Closes #1750

Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
6 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.
6 years ago
Travis Ralston 828e3f83bd Merge branch 'm.org-master' into rav/proposal/cs_api_in_login 6 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"
6 years ago
Travis Ralston 6dab287708
Revert "MSC1730: Mechanism for redirecting to an alternative server during login" 6 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
6 years ago
Travis Ralston 9aff2583c5
Merge pull request #1745 from jryans/encrypted-rule-clarify
Clarify encrypted push rules
6 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>
6 years ago
Erik Johnston a8bd2f32fd Update example 6 years ago
Erik Johnston 8a3e7b751c Add missing apostrophe 6 years ago
Richard van der Hoff 7782781442
Update wording to be betterer
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
Richard van der Hoff 612d8a66ef
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
Richard van der Hoff f06455479d
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
Richard van der Hoff 539ca4cf15
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
Richard van der Hoff c581c6132e
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
Richard van der Hoff eaaf36edf7
Update proposals/1442-state-resolution.md
Co-Authored-By: erikjohnston <erikj@jki.re>
6 years ago
Kitsune Ral 6d0def8b4c Spec lazy_load_members and include_redundant_members
Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
6 years ago
Travis Ralston 7461cd7f68
Add changelog 6 years ago
Travis Ralston 1268b421ec
Update the m.presence schema to include status_msg 6 years ago
Travis Ralston f78bb72be8
Add status_msg to m.presence example 6 years ago
David Baker e318286404 Add 'sandbox' to recommended CSP header 6 years ago
Erik Johnston 6c9a433805 Add example of rejected events getting into state 6 years ago
Erik Johnston 55ebf7dc32
MSC 1466 - Soft Logout (#1467) 6 years ago
Richard van der Hoff 6f7b3198fb fix list which got lost in merge 6 years ago
Richard van der Hoff 275e516f93 Rename svg file to bust cache
github is serving up the old file for some reason
6 years ago
Richard van der Hoff a9c4ea690d Merge branch 'rav/msc1730/work' into rav/proposal/cs_api_in_login 6 years ago
Richard van der Hoff 9c9c5a8c65 more alternatives 6 years ago
Richard van der Hoff 57421cc59b attempt to clarify MSC1730 6 years ago
Ben Parsons 16f17855c9 link to CS API Swagger Viewer 6 years ago
Ben Parsons 43109a717f placeholder for proposals CSS 6 years ago
Andrew Morgan 1e9a7d968b
Merge pull request #1721 from matrix-org/rav/proposal/sso_login
MSC1721: Rename m.login.cas to m.login.sso
6 years ago
Richard van der Hoff 6fa754c447
Tradeoffs->rejected solutions
because apparently this was somehow confusing
6 years ago
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.
6 years ago
Travis Ralston 6dd2120337
Merge pull request #1729 from QMatrixClient/kitsune/filling-spec-gaps
joining.yaml: add missing response schema details
6 years ago
Richard van der Hoff a39189c08b Update proposal
Notes on problems, workaround, and another alternative
6 years ago
Richard van der Hoff 6f2c2b2c7e MSC1730: Mechanism for redirecting to an alternative server during login 6 years ago
Kitsune Ral 6782b6399f
Update according to the comments 6 years ago
Richard van der Hoff b5a82a5eb1
no need to rename ticket endpoint 6 years ago
Kitsune Ral 96d7eed1c6 joining.yaml: add missing response schema details 6 years ago
Richard van der Hoff 0c4b09305e Proposal to rename m.login.cas to m.login.sso 6 years ago
Travis Ralston ef33c175b5
Merge pull request #1718 from uhoreg/fix_proposal_heading
make heading level for "Security considerations" match the other headings
6 years ago
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
6 years ago
Richard van der Hoff e789eb186a link to MSC1711 6 years ago
Matthew Hodgson b1e79ac7ab
Update 1708-well-known-for-federation.md 6 years ago
Richard van der Hoff bc29015514
fix typo 6 years ago
Richard van der Hoff f9cf99f1fd
typo 6 years ago
Richard van der Hoff 6a3d68b7ed
Merge pull request #1712 from matrix-org/rav/update_issue_list
Change the labels the proposals list looks for
6 years ago
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
6 years ago
Richard van der Hoff efc8056fb6 fix a couple of broken links 6 years ago