Commit Graph

1062 Commits

Author SHA1 Message Date
Travis Ralston cac72ff873
Merge pull request from matrix-org/travis/403-id-unbind
Add 403 error to IS unbind
2019-06-13 06:25:28 -06:00
Travis Ralston 67ea3b9ce8 Add 403 error to IS unbind
Fixes https://github.com/matrix-org/matrix-doc/issues/2117
2019-06-12 15:41:10 -06:00
Travis Ralston b8f1f37927 Remove incorrect id_server param from IS spec
Fixes https://github.com/matrix-org/matrix-doc/issues/2118
2019-06-12 15:29:25 -06:00
Travis Ralston 8f1f8b4fe5 Fix references to filtering
We can't have two different backlinks for the same text, so use LL as the label
2019-06-11 11:28:35 -06:00
Travis Ralston 8ac555f870
Merge pull request from matrix-org/travis/1.0/key-object
Clarify the key object definition for the key management API
2019-06-11 09:50:34 -06:00
Travis Ralston 8b7887dfc2 Link to key algorithms section 2019-06-11 09:47:02 -06:00
Travis Ralston 19f017f9bd
Merge pull request 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 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 85f34f942f Fix invalid doc error
Another annoying case of Swagger fighting us
2019-06-11 09:18:29 -06:00
Travis Ralston f7aa2adfb4 Fix indentation 2019-06-11 09:16:44 -06:00
Travis Ralston 6d60258e25
Merge pull request 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 ca8b539b2f humans prefer to be treated as people 2019-06-11 08:47:25 -06:00
Travis Ralston 370ae8b9fe
Merge pull request from matrix-org/travis/1.0/mxc
Refactor documentation for content/media repository
2019-06-11 08:32:06 -06:00
Travis Ralston b7378a860a
Merge pull request 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 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 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
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
Matthew Hodgson 0506d09cf7 incorporate LL review from matthew 2019-06-10 19:38:44 +01:00
Travis Ralston f047e235df Merge branch 'master' into travis/1.0/event-ids 2019-06-10 10:52:34 -06:00
Travis Ralston 6d62a1b444
Merge pull request from matrix-org/travis/1.0/s2s-swagger-touchups
Touchups on the s2s swagger definitions
2019-06-10 07:22:24 -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 ab0c1bc054 Add changelog, update imperative check, rename sid.yaml 2019-06-10 08:41:35 +01: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
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 906d3cd447
Merge pull request from matrix-org/travis/1.0/registration-clarification
Clarify guest accounts and `auth` usage on /register
2019-06-07 10:05:56 -06:00
Andrew Morgan 62910a28cc Merge branch 'master' into anoa/hs_3pid_tokens
* master:
  Update example
  Fix 404s in links from room v1 spec
  Provide a more complete example of a "minimally-sized event"
  Revert signature change for redactable event test
  Clarify how many PDUs are in a given transaction object
  Clarify that the server shouldn't process retries for UIA
  Clarify when authorization and rate-limiting are not applicable
  Skip over partial event definitions in examples
  Rename example to invite_room_state
  Shorten references to StrippedState in s2s spec
  Fix examples of StrippedState in s2s spec
  Clarify exactly what StrippedState is
  Clarify that UIA stages cannot be attempted twice
  Fix test vectors with invalid JSON and signature
  Spec 3PID unbind API
  Spec MSISDN UIA support
2019-06-07 15:55:04 +01:00
Andrew Morgan 3148184052 HS' can send 3PID token. Add a new submit_url field 2019-06-07 15:54:51 +01:00
Travis Ralston a0e8201816
Apply suggestions from code review
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-06-07 08:27:53 -06:00
Travis Ralston 77c4c4b07c Add general clarity 2019-06-07 08:27:18 -06:00
Travis Ralston 9cf03325b9
Merge pull request from matrix-org/travis/1.0/msc1915-unbind
Spec 3PID unbind API
2019-06-07 07:33:33 -06:00
Travis Ralston 70da564e2b
Merge pull request from matrix-org/travis/1.0/stripped-state
Clarify exactly what StrippedState is
2019-06-07 07:12:17 -06:00
Travis Ralston b9c9396c11 Specify some of the common concepts for Matrix in the index
See https://github.com/matrix-org/matrix-doc/pull/2061
Fixes https://github.com/matrix-org/matrix-doc/issues/1468
Fixes https://github.com/matrix-org/matrix-doc/issues/1528

The section is not referenced by the specifications yet - they do a fairly good job of explaining it over and over. In future, it would be good to point all the references to the index.
2019-06-06 15:59:54 -06:00
Travis Ralston f0eb495cee Clarify how notification counts are calculated in /sync
Fixes https://github.com/matrix-org/matrix-doc/issues/2015
2019-06-06 15:41:28 -06:00
Travis Ralston 9bf0103ef3 Clarify how many PDUs are in a given transaction object
Fixes https://github.com/matrix-org/matrix-doc/issues/2093
2019-06-06 14:36:30 -06:00
Travis Ralston afead2eb1b Clarify LL in /sync a bit more 2019-06-06 14:18:41 -06:00
Travis Ralston e1266b859f
Merge pull request from matrix-org/travis/1.0/bind-msisdn
Spec MSISDN UIA support
2019-06-06 10:24:34 -06:00