Commit graph

461 commits

Author SHA1 Message Date
Travis Ralston ef5d3b9f30 Correct token reference in MSC2140 2019-08-28 15:46:58 -06:00
Travis Ralston 356350de91
Merge pull request #2140 from matrix-org/dbkr/tos_2
MSC2140: Terms of Service for ISes and IMs
2019-08-26 13:48:45 -06:00
Travis Ralston 7a36016cbb
Merge pull request #2230 from matrix-org/dbkr/is_in_account_data
MSC2230: Store Identity Server in Account Data
2019-08-26 08:21:04 -06:00
Travis Ralston 0265817c56
Merge pull request #1957 from matrix-org/travis/msc/integrations/discovery
MSC1957: Integration manager discovery
2019-08-25 19:25:46 -06:00
Travis Ralston 4ad9bf7059
Merge pull request #1961 from matrix-org/travis/msc/integrations/auth
MSC1961: Integration manager authentication APIs
2019-08-23 14:24:09 -06:00
Travis Ralston b6f0e8e8ed Clarify that the query string is because they are widgets 2019-08-21 17:50:18 -06:00
Travis Ralston 8b85fda52c Add a link to the widget MSC to try and stem questions 2019-08-21 17:47:55 -06:00
David Baker 4ea8f645d6 is_token -> id_access_token and add invite to proxy list 2019-08-21 18:13:50 +01:00
Travis Ralston 8ca50eaf9f
Merge pull request #2010 from Sorunome/soru/spoilers
MSC2010: Add client-side spoilers
2019-08-21 08:34:24 -06:00
David Baker 8bd9d7caeb
Add full stop
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-08-21 15:12:45 +01:00
David Baker 69315417b5
Typo
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-08-21 15:12:25 +01:00
David Baker 4073d940da
Typo
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-08-21 15:11:10 +01:00
David Baker 1f8cfd5729 Update migration mechanism 2019-08-21 14:19:20 +01:00
Travis Ralston 53a2ffb12a
Merge pull request #2197 from reivilibre/rei/msc_filter_over_fed
MSC2197: Search Filtering in Federation /publicRooms
2019-08-20 15:35:29 -06:00
Travis Ralston 788796e1c6 Multiple clarifications 2019-08-20 09:20:07 -06:00
David Baker 9b2ca3cdfe
typoes / clarifications
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-08-20 16:19:15 +01:00
Travis Ralston 9e073e9647
Speeeeeeling
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-08-19 10:42:30 -06:00
Andrew Morgan 997c5466a8
MSC2229: Allowing 3PID Owners to Rebind (#2229) 2019-08-19 13:35:02 +01:00
David Baker 6d0067320c clarify error proxying 2019-08-19 13:31:44 +01:00
David Baker 12377fbf50
/account/logout not /logout
Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-08-19 11:53:41 +01:00
David Baker e4bdc283fd
Apply suggestions from code review
Typos / spelling

Co-Authored-By: Hubert Chathi <hubert@uhoreg.ca>
2019-08-19 11:45:46 +01:00
Olivier Wilkinson (reivilibre) 76f9196ff3 Address @richvdh's comments 2019-08-19 07:44:37 +01:00
Travis Ralston 865d3da0f8 General clarity improvements 2019-08-16 19:59:32 -06:00
Travis Ralston 22c9692684 Disclose origin story better 2019-08-16 19:53:28 -06:00
Travis Ralston 475c64de8c Disclose origin story 2019-08-16 19:52:35 -06:00
Andrew Morgan 4059661c29
Update proposals/2229-rebind-existing-3pid.md
Co-Authored-By: Kitsune Ral <Kitsune-Ral@users.sf.net>
2019-08-14 11:38:53 +01:00
Olivier Wilkinson (reivilibre) 4219e272ec Drop the hard SHOULD
Adopts @turt2live's phrasing

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-14 11:06:45 +01:00
Olivier Wilkinson (reivilibre) 7e85b9d56a Acknowledge other potential error responses for fallback
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-14 11:03:55 +01:00
Olivier Wilkinson (reivilibre) 97f856d706 Domain name is potentially personally-identifying
Thanks to @turt2live

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-14 11:00:03 +01:00
David Baker b9b984ae60 clarify 2019-08-14 09:52:13 +01:00
David Baker 229cb67b01
Apply suggestions from code review
Use fewer formal MUST etc in proposal

Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-08-14 09:51:27 +01:00
Andrew Morgan 7758e0701c Remove homeserver warning 2019-08-13 18:22:06 +01:00
David Baker 2c8d112089 assign number 2019-08-13 18:03:43 +01:00
Andrew Morgan 2e2a74a235 Merge branch 'anoa/rebind_3pids' of github.com:matrix-org/matrix-doc into anoa/rebind_3pids 2019-08-13 17:17:11 +01:00
Andrew Morgan 2547cc443c backticks 2019-08-13 17:17:06 +01:00
Andrew Morgan 01fc54faae
Update proposals/2229-rebind-existing-3pid.md
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-08-13 17:15:48 +01:00
Andrew Morgan 5b1ea4ffcb
Update proposals/2229-rebind-existing-3pid.md
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-13 17:13:48 +01:00
Andrew Morgan cb1e3b8373 Take into account the 1 is case 2019-08-13 13:29:35 +01:00
Andrew Morgan f313b49c26 Add bind def. 2019-08-13 11:40:34 +01:00
Andrew Morgan be77b5823c fix up 2019-08-13 11:24:37 +01:00
Andrew Morgan 6ed0ae36ba rename msc # 2019-08-13 11:12:04 +01:00
Andrew Morgan ed4d805d2f flesh out 2019-08-13 11:11:22 +01:00
David Baker 6330fff5a4 Draft for IS URL in account data 2019-08-12 18:13:58 +01:00
Andrew Morgan 783fd78a6f wip 2019-08-12 17:13:37 +01:00
Olivier Wilkinson (reivilibre) 60cbc4567b Addresses some of Andrew's comments
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-09 11:21:39 +01:00
Travis Ralston a171d5f6fd Check for a state_key on the tombstone push rule
This is an oversight from the proposal.
2019-08-08 09:29:52 -06:00
Travis Ralston 3087c76452
Merge pull request #2134 from matrix-org/hs/hash-identity
MSC2134: Identity Hash Lookups
2019-08-07 19:48:36 -06:00
Olivier Wilkinson (reivilibre) 493bb062af MSC2197: update with privacy perspective
Includes recommendations for client developers.

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
2019-08-05 09:50:24 +01:00
Travis Ralston a71757f1ee
Merge pull request #2174 from matrix-org/rav/proposals/move_redacts_key
MSC2174: Move the `redacts` key to a sane place
2019-08-03 11:01:28 -06:00
Andrew Morgan 3edf5e3c16 Make hashes real values 2019-08-02 11:25:28 +01:00