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
3553 commits 30 branches 42 tags 32 MiB
Commit graph

3553 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hubert Chathi d9eddcf7df change language to json in code blocks 2018-12-17 20:34:27 -05:00
Hubert Chathi e9aa4081bc fix sectioning and add a background 2018-12-17 18:52:30 -05:00
Hubert Chathi 2d3b5f4481 make text consistent with image 2018-12-14 19:11:17 -05:00
Hubert Chathi f3997cd09e graphviz-ify graphs and add some more structure 2018-12-14 19:08:37 -05:00
Hubert Chathi de11738210 rename to match PR 2018-12-14 00:25:18 -05:00
Hubert Chathi d90aeda658 draft of alternate proposal for cross-signing 2018-12-14 00:14:03 -05: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
Richard van der Hoff fa0b4f9e13 Make the proposal labels match what happens in practice 2018-12-13 11:14:21 +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 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 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
Matthew Hodgson 179162379e spell out that shepherd cannot be author 2018-10-27 19:34:52 +01:00
Erik Johnston 4271391214
Initial stab at documenting soft fail (#1641) 2018-10-26 15:18:04 +01:00
Andrew Morgan f288facec8
Merge pull request #1697 from matrix-org/anoa/msc_update 
The new and improved MSC process
 2018-10-23 20:02:36 +02:00
Andrew Morgan f8ffa79b56 Update and clarify proposal labels 2018-10-23 19:37:51 +02:00
Richard van der Hoff 42f7a21fc8
Merge pull request #1502 from matrix-org/rav/room_upgrades 
MSC 1501: Room version upgrades
 2018-10-23 15:42:52 +01:00
Richard van der Hoff 21a45948ca Explain rationale for setting server_name when joining upgraded room 2018-10-22 17:03:48 +01:00
Andrew Morgan 2b259c6a7b Remove etiquette page from targets 2018-10-21 00:54:04 +02:00
Andrew Morgan 4b858a7993 DCO required for proposal and spec PR 2018-10-21 00:52:39 +02:00
Andrew Morgan 0afb122760 Clarification on FCPs 2018-10-20 23:50:26 +02:00
Andrew Morgan f00be6b0d8 Etiquette -> guiding principles 2018-10-20 23:35:33 +02:00