Commit graph

4175 commits

Author SHA1 Message Date
Travis Ralston 19f017f9bd
Merge pull request #2035 from matrix-org/travis/1.0/msc688-msc1227-lazy-loading
Spec lazy-loading room members
2019-06-11 09:39:32 -06:00
Travis Ralston fbdb56a29f
Merge pull request #2101 from matrix-org/anoa/hs_3pid_tokens
Add submit_url field to requestToken responses, clarify HS's can send tokens themselves
2019-06-11 09:25:53 -06:00
Travis Ralston 56745c76aa Clarify that submit_url being not present only matters for r0.5 2019-06-11 09:22:02 -06:00
Travis Ralston 6d60258e25
Merge pull request #2080 from matrix-org/travis/1.0/msc2076-msc2077-v5-rooms
Spec v5 rooms: Key validity
2019-06-11 08:51:25 -06:00
Travis Ralston b32f0e768f clarify that UIA can now be done by the HS 2019-06-11 08:47:40 -06:00
Travis Ralston ca8b539b2f humans prefer to be treated as people 2019-06-11 08:47:25 -06:00
Travis Ralston 370ae8b9fe
Merge pull request #2068 from matrix-org/travis/1.0/mxc
Refactor documentation for content/media repository
2019-06-11 08:32:06 -06:00
Travis Ralston 04930c6ddf Don't enforce MXC URIs, but also don't confuse people 2019-06-11 08:29:50 -06:00
Travis Ralston ad3aa5edf0
Merge pull request #2104 from matrix-org/travis/1.0/event-ids
Clarify that the common identifier format can be broken
2019-06-11 07:51:34 -06:00
Travis Ralston b7378a860a
Merge pull request #2097 from matrix-org/travis/1.0/common-themes
Specify some of the common concepts for Matrix in the index
2019-06-11 07:51:06 -06:00
Travis Ralston c1c26859e2
Merge pull request #2096 from matrix-org/travis/1.0/read-notifs
Clarify how notification counts are calculated in /sync
2019-06-11 07:50:33 -06:00
Travis Ralston 39b79fe453
Merge pull request #2088 from matrix-org/travis/1.0/duplicate-state-endpoint
Merge GET/PUT /state/:event_type endpoints
2019-06-11 07:49:20 -06:00
Andrew Morgan 5f24f63338 Better wording 2019-06-10 19:21:14 -04:00
Andrew Morgan 1a22508e15 identity server -> the server 2019-06-10 19:18:58 -04:00
Andrew Morgan 572d29348c
Update changelogs/client_server/newsfragments/2101.breaking
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-06-11 00:18:37 +01:00
Travis Ralston fc1d8f184d
Merge pull request #2078 from matrix-org/anoa/msc2078
MSC2078: Sending Third-Party Request Tokens via the Homeserver
2019-06-10 14:25:35 -06:00
Travis Ralston ad2eefdde9 Shuffle and clarify identifier grammar
Specifically, make it clearer that event IDs are the weird exception in this section.
2019-06-10 14:23:04 -06:00
Travis Ralston 32761fc108
Merge pull request #2098 from matrix-org/travis/1.0/modules-update
Clarify what a "module" is and update feature profiles for clients
2019-06-10 14:05:15 -06:00
Travis Ralston 19c827e581 Remove trailing slashes section 2019-06-10 13:49:05 -06:00
Travis Ralston 49831fb74f Clarifications about namespaces 2019-06-10 13:48:55 -06:00
Travis Ralston 1886a2346a Move explanation of notifications to notifications module 2019-06-10 13:38:43 -06:00
Travis Ralston cf19f52576 Enforce 7 day validity requirement everywhere
also misc formatting fixes
2019-06-10 13:21:24 -06:00
Travis Ralston 56e1640bea
Merge pull request #2106 from matrix-org/matthew/1.0/msc688-msc1227-lazy-loading
incorporate LL review from matthew
2019-06-10 13:02:09 -06:00
Matthew Hodgson 0506d09cf7 incorporate LL review from matthew 2019-06-10 19:38:44 +01:00
Travis Ralston 36659ca266
Merge pull request #2091 from matrix-org/travis/1.0/mxid-register
Clarify that /register must produce valid Matrix User IDs
2019-06-10 11:08:41 -06:00
Travis Ralston f047e235df Merge branch 'master' into travis/1.0/event-ids 2019-06-10 10:52:34 -06:00
Travis Ralston 65c3935419
Merge pull request #2076 from matrix-org/rav/proposal/enforce_key_validity_periods
MSC2076: Enforce key-validity periods when validating event signatures
2019-06-10 07:25:09 -06:00
Travis Ralston 19575eb4d4
Merge pull request #2077 from matrix-org/rav/proposal/room_v5
MSC2077: room v5
2019-06-10 07:24:41 -06:00
Travis Ralston 6d62a1b444
Merge pull request #2084 from matrix-org/travis/1.0/s2s-swagger-touchups
Touchups on the s2s swagger definitions
2019-06-10 07:22:24 -06:00
Travis Ralston 7fe7d365e2
Merge pull request #2089 from matrix-org/travis/1.0/cors
Clarify when and where CORS headers should be returned
2019-06-10 07:21:52 -06:00
Andrew Morgan 2068cba598 Clients should submit a POST request 2019-06-10 09:14:25 +01:00
Andrew Morgan 7116f9334e More consolidation 2019-06-10 09:09:26 +01:00
Andrew Morgan d1fde0837a Consolidate id_server into ref. id_server/next_link are ignored 2019-06-10 09:06:13 +01:00
Andrew Morgan 0f82056ca2 Highlight breaking change 2019-06-10 08:43:34 +01:00
Andrew Morgan ab0c1bc054 Add changelog, update imperative check, rename sid.yaml 2019-06-10 08:41:35 +01:00
Travis Ralston 29340c6eb8 Clarify that the common identifier format can be broken
We already reference in the Event IDs section that the format depends on the room version, so we just need to link there.

Fixes https://github.com/matrix-org/matrix-doc/issues/2103
2019-06-09 22:50:23 -06:00
Andrew Morgan fe23de7d7f A SMS -> An SMS 2019-06-10 05:20:15 +01:00
Andrew Morgan 046a834488 Slight code cleanup 2019-06-09 22:04:58 +01:00
Andrew Morgan 2551ff6ce0 Actually check in code 2019-06-09 20:12:59 +01:00
Andrew Morgan 525bedf8e1 Fix refs 2019-06-09 20:10:44 +01:00
Andrew Morgan fba61941af Move submit_url responses to ref 2019-06-09 20:02:57 +01:00
Andrew Morgan 0ded484276 Address review comments 2019-06-09 16:10:44 +01:00
Andrew Morgan 1776ba28d3 Address review comments 2019-06-08 18:52:38 +01:00
Matthew Hodgson 3438ea50a2
Merge pull request #1779 from matrix-org/matthew/msc1779
MSC1779: Proposal for Open Governance for Matrix.org (v2)
2019-06-07 19:20:19 +01:00
Matthew Hodgson 950415c72a
Merge branch 'master' into matthew/msc1779 2019-06-07 19:19:19 +01:00
Matthew Hodgson be568ba9ab link to the legalified version of MSC1779 2019-06-07 19:10:26 +01:00
Andrew Morgan a8edb066aa Clear up some wording 2019-06-07 18:00:12 +01:00
Andrew Morgan 8a6ef187db more object! 2019-06-07 17:52:17 +01:00
Travis Ralston a38af2009f
Apply suggestions from code review
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-06-07 10:37:57 -06:00
Travis Ralston 4b6e2cc956
Merge pull request #2072 from matrix-org/travis/1.0/msc1717-msc1267-sas-verification
Spec SAS verification and the common key verification framework
2019-06-07 10:34:08 -06:00