Commit Graph

3545 Commits (f7c7a74092dc7b0b157565593b9b8057cec55bd4)
 

Author SHA1 Message Date
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 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 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 767af87744
Merge pull request #1701 from uhoreg/e2e_export
document megolm session export format
6 years ago
Hubert Chathi 189725659a clarifications and formatting fixes 6 years ago
Hubert Chathi 1be3bd602a add changelog 6 years ago
Matthew Hodgson 179162379e spell out that shepherd cannot be author 6 years ago
Erik Johnston 4271391214
Initial stab at documenting soft fail (#1641) 6 years ago
Andrew Morgan f288facec8
Merge pull request #1697 from matrix-org/anoa/msc_update
The new and improved MSC process
6 years ago
Andrew Morgan f8ffa79b56 Update and clarify proposal labels 6 years ago
Richard van der Hoff 42f7a21fc8
Merge pull request #1502 from matrix-org/rav/room_upgrades
MSC 1501: Room version upgrades
6 years ago
Richard van der Hoff 21a45948ca Explain rationale for setting server_name when joining upgraded room 6 years ago
Andrew Morgan 2b259c6a7b Remove etiquette page from targets 6 years ago
Andrew Morgan 4b858a7993 DCO required for proposal and spec PR 6 years ago
Andrew Morgan 0afb122760 Clarification on FCPs 6 years ago
Andrew Morgan f00be6b0d8 Etiquette -> guiding principles 6 years ago
Hubert Chathi 46fde9723c document megolm session export format 6 years ago
Matthew Hodgson c6e0a88b09 fix irc bridge example properly 6 years ago
Matthew Hodgson 7a86bc4a66 fix missing escapes on AS regexp 6 years ago
Andrew Morgan ea21e31a0c Merge branch 'anoa/msc_update' of github.com:matrix-org/matrix-doc into anoa/msc_update 6 years ago
Andrew Morgan 7bff4d288c be begin -> begin 6 years ago
Richard van der Hoff 14b98a0220 A couple of clarifications
- the body of the tombstone is defined by the server.
- the client can follow tombstones until it finds a live room
6 years ago
Travis Ralston b5e5a690f5 add version to example m.room.create event 6 years ago
Travis Ralston 5a2d28e7fd Reduce more abbreviations! 6 years ago