Travis Ralston
cb4fcd1d09
Merge remote-tracking branch 'matrix-org/master' into travis/s2s/transactions-swagger
2018-07-24 09:15:36 -06:00
Travis Ralston
88beaf4ad8
Completely remove /pull
...
It's not been in use for years - we can safely let it disappear
2018-07-24 09:13:46 -06:00
Travis Ralston
21c4af70a9
Fix schema definitions (spelling, attributes)
2018-07-24 09:13:15 -06:00
Travis Ralston
2aafde4549
Merge pull request #1419 from turt2live/travis/s2s/3pinvites-swagger
...
Convert third party invite exchange to swagger
2018-07-23 10:33:00 -06:00
Travis Ralston
89384c96c1
Full stops, language.
2018-07-18 11:06:23 -06:00
Travis Ralston
e226b60c7f
Merge remote-tracking branch 'matrix-org/master' into travis/s2s/transactions-swagger
2018-07-18 10:59:39 -06:00
Travis Ralston
bafdcf3640
Full stops, spelling, and operation IDs.
2018-07-18 10:37:56 -06:00
Travis Ralston
7cb918407d
Merge remote-tracking branch 'matrix-org/master' into travis/s2s/keys-swagger
2018-07-18 10:32:46 -06:00
Travis Ralston
05fb94e195
Merge remote-tracking branch 'matrix-org/master' into travis/better-errors
2018-07-18 08:28:16 -06:00
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
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
e5da1e1741
Improve upon the transaction schema and examples
...
Reduces data duplication and makes the objects more reusable for other areas of the spec
2018-07-12 21:34:52 -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
1829589d23
Convert 3pn errors to new definition
2018-07-12 12:16:11 -06:00
Travis Ralston
197c36c520
Merge remote-tracking branch 'matrix-org/master' into travis/better-errors
2018-07-12 12:13:07 -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
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
Travis Ralston
84e07a0c10
Convert errors in presence.yaml
2018-07-12 09:31:50 -06:00
Travis Ralston
16125f16f5
Spec retry_after_ms on ratelimit errors
2018-07-12 09:28:30 -06:00
Travis Ralston
8b513b9f8e
Merge remote-tracking branch 'matrix-org/master' into travis/better-errors
2018-07-12 09:24:04 -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
374ec00046
Convert things that mention "Transaction" to swagger
...
There's two kinds of transactions currently: one with EDUs and one without. The one with EDUs is only used on /send, however the schema is still somewhat worth splitting out for simplicity.
The examples are brought apart to make them slightly more reusable for when they get dumped into the relevant sections of the spec (see TODO in server_server_api.rst)
Further, the Transactions stuff introduces tuples to the spec. The units.py has been updated to support this.
2018-07-11 16:52:27 -06:00
Travis Ralston
3e13ec2841
Fix required properties in POST /query
2018-07-11 13:43:15 -06:00
Travis Ralston
96889f16e9
Split out and fix the /server and /query key APIs
2018-07-11 13:20:44 -06:00
Travis Ralston
bd2c0b7c98
Convert server keys to swagger
2018-07-11 13:09:19 -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
d7a979da63
Merge remote-tracking branch 'matrix-org/master' into travis/all-the-auth
2018-07-06 11:33:24 -06:00
Travis Ralston
516000bdc3
Fix error reference in media repo
2018-07-06 08:53:04 -06:00
Travis Ralston
ab75fc4b20
Merge remote-tracking branch 'matrix-org/master' into travis/better-errors
2018-07-06 08:46: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
Travis Ralston
bbf63d116c
Fix reference to error.yaml in forget room API
2018-07-05 16:55:11 -06:00
Travis Ralston
55c27d6212
Merge branch 'master' into travis/better-errors
2018-07-05 13:40:17 -06:00
Travis Ralston
4485b2f025
Merge branch 'master' into travis/server-name-join
2018-07-05 11:23:13 -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
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
Andrew Morgan
4c38012122
I can spell
2018-07-05 12:58:42 +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