Commit graph

2715 commits

Author SHA1 Message Date
Travis Ralston 272f3d8432 Fix documentation link 2018-07-13 15:49:49 -06:00
Travis Ralston cf93c88337 Convert third party invite exchange to swagger 2018-07-13 15:44:33 -06:00
Richard van der Hoff 7ba9979fa4
Merge pull request #1386 from Cadair/circleci
Add a config for circleci which builds the doc preview
2018-07-13 15:48:13 +01:00
Travis Ralston d2b0b1bbda
Merge pull request #1379 from turt2live/travis/preset-guests
Document guest_access in /createRoom presets; Make presets a table
2018-07-13 08:42:23 -06:00
Travis Ralston e001a94612
Merge pull request #1412 from turt2live/travis/s2s/query
Convert the general query API to swagger
2018-07-13 08:16:37 -06:00
Travis Ralston 51faf8ed2e Convert the general query API to swagger
Includes "moving" the directory query API into the same area. This will make more sense once the other query types are specified.
2018-07-12 13:46:42 -06:00
Travis Ralston 91c59e7384
Merge pull request #1353 from matrix-org/anoa/as_thirdparty_lookup
Thirdparty Entity Lookup API
2018-07-12 11:19:12 -06:00
Travis Ralston 0faae54fc1
Merge pull request #1400 from turt2live/travis/search-improvements
Clarify some of the properties on the search result
2018-07-12 10:36:18 -06:00
Andrew Morgan 291a4dfc76 Third party lookup module. Fix wording 2018-07-12 16:59:30 +01:00
Travis Ralston 6e3993effe Merge remote-tracking branch 'matrix-org/master' into travis/preset-guests 2018-07-12 09:48:52 -06:00
Andrew Morgan 8999887245 Path -> query params 2018-07-12 14:44:48 +01:00
Andrew Morgan 9bde78ac28 $ref needs to be under a schema: 2018-07-12 14:41:24 +01:00
Andrew Morgan 114bcf1a2e Use $ref, clean up, fix errors, AS is now a C-S module. 2018-07-12 14:31:34 +01:00
Travis Ralston 808a82e811
Merge pull request #1397 from turt2live/travis/text-format
Document message formats as-is
2018-07-11 08:10:26 -06:00
Travis Ralston b6f9e13d46 Add newsfragment 2018-07-10 15:09:53 -06:00
Travis Ralston fbee83d5cf Clarify some of the properties on the search result
Fixes https://github.com/matrix-org/matrix-doc/issues/773
2018-07-10 15:08:28 -06:00
Travis Ralston c999b7c2e2 Add newsfragment 2018-07-10 13:00:37 -06:00
Travis Ralston 55e4e90ab1 Document message formats as-is
This is likely to later be replaced by mixins, however this is being documented now so clients aren't left in the dark.

Fixes https://github.com/matrix-org/matrix-doc/issues/917
2018-07-10 12:52:11 -06:00
Travis Ralston c79010f0d6
Merge pull request #1365 from turt2live/travis/cors
Document the CORS/preflight headers
2018-07-10 08:35:37 -06:00
Travis Ralston 423d5593f5 Generify how OPTIONS and CORS are handled 2018-07-09 15:40:03 -06:00
Travis Ralston 44db84f3d8
Merge pull request #1371 from turt2live/travis/all-the-auth
Getting presence requires authentication
2018-07-09 10:31:40 -06:00
Travis Ralston d7a979da63 Merge remote-tracking branch 'matrix-org/master' into travis/all-the-auth 2018-07-06 11:33:24 -06:00
Travis Ralston dd9414472b Merge remote-tracking branch 'matrix-org/master' into travis/cors 2018-07-06 08:51:32 -06:00
Travis Ralston e1885e4cd3
Merge pull request #1362 from turt2live/travis/spec-reason
Explicitly declare that the kick/ban reason will be on the membership event
2018-07-06 07:06:50 -06:00
Travis Ralston e7a6ff1064
Merge branch 'master' into travis/spec-reason 2018-07-06 07:02:11 -06:00
Travis Ralston 1722734a51
Merge pull request #1364 from turt2live/travis/server-name-join
Document the server_name query parameter on /join/{roomIdOrAlias}
2018-07-06 07:00:24 -06:00
Will Hunt ff3c379339
Merge pull request #1189 from Half-Shot/hs/upload-limits
GET media/config 🎉
2018-07-06 11:37:35 +00:00
Will Hunt 77f4ac54aa
Wordy intro sentence for description 2018-07-06 10:36:17 +01:00
Will Hunt 2e6cc8045c
Better indent of description 2018-07-06 10:29:05 +01:00
Will Hunt d5ce87e956
Split summary up into description and summary 2018-07-06 10:27:03 +01:00
Stuart Mumford be5232914a
Maybe a swagger 2018-07-05 21:41:05 -06:00
Stuart Mumford b7c3a74022
artifacts 2018-07-05 21:31:57 -06:00
Stuart Mumford fe43b79e73
what's even the point 2018-07-05 21:29:12 -06:00
Stuart Mumford 86b0045195
virtualenvs are the worst 2018-07-05 21:25:15 -06:00
Stuart Mumford d1c8ec9e48
add circle config 2018-07-05 21:21:47 -06:00
Richard van der Hoff 3f8aa2eccd
Merge pull request #1369 from turt2live/travis/apis-unstable
Clearly say that the server/server API is unstable and subject to change
2018-07-05 20:38:35 +01:00
Richard van der Hoff f9a0a49e96 Add a bunch more people to the speculator trusted list 2018-07-05 20:27:40 +01:00
Travis Ralston 4485b2f025
Merge branch 'master' into travis/server-name-join 2018-07-05 11:23:13 -06:00
Travis Ralston 9abbbfb81e
Merge pull request #1378 from turt2live/travis/dont-forget-to-leave
Document that clients must leave before forgetting rooms
2018-07-05 11:03:15 -06:00
Travis Ralston c1c1f28c79
Merge branch 'master' into travis/dont-forget-to-leave 2018-07-05 10:55:48 -06:00
Travis Ralston 3935861445
Merge pull request #1380 from turt2live/travis/define-roomevent
Define RoomEvent on /rooms/{roomId}/messages
2018-07-05 10:54:54 -06:00
Travis Ralston f98f603048
Merge pull request #1381 from turt2live/travis/general-clarifications
Rename some titles to avoid confusion between request and response schemas
2018-07-05 10:54:22 -06:00
Andrew Morgan e81e0328c2 Fix single protocol metadata endpoint path, remove 500s 2018-07-05 17:50:34 +01:00
Travis Ralston 16860ddd22 De-quote 2018-07-05 10:46:53 -06:00
Travis Ralston 887a6fb18f
Merge pull request #1336 from remram44/patch-1
Consolidate backwards-compatible client changes
2018-07-05 10:35:16 -06:00
Andrew Morgan 4c38012122 I can spell 2018-07-05 12:58:42 +01:00
Andrew Morgan 8e22e9e85a Fix title underline length 2018-07-05 12:00:20 +01:00
Andrew Morgan e6218b56ab Switch properties to schema 2018-07-05 11:59:10 +01:00
Andrew Morgan a6dad76c01 Fix indentation 2018-07-05 11:56:30 +01:00
Andrew Morgan cc3724b54a fix indentation, error messages. add rest of PR 2018-07-05 11:55:25 +01:00