Commit graph

2792 commits

Author SHA1 Message Date
Travis Ralston
5ade15534d Remove extra branch in example generation 2018-07-24 10:17:39 -06:00
Travis Ralston
042772aaf5 Make nested titles better 2018-07-24 10:13:23 -06:00
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
a4e5a461f9 Improve handing of lists appearing in items 2018-07-24 09:14:31 -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
Ben Parsons
01d01cfbbb
Merge pull request #1440 from matrix-org/benp/clarifyintro
Improve discoverability of /docs/spec/intro/ document by including content in /docs/spec/
2018-07-24 11:43:43 +01:00
Ben Parsons
07aeaadef9 update links which used to point to docs/spec/intro 2018-07-24 11:41:03 +01:00
Matthew Hodgson
4fdc22dc90
Merge pull request #1447 from Cadair/gilesconfig
Fix typo in Giles config
2018-07-24 11:10:09 +01:00
Stuart Mumford
7c71b697e7
Fix typo in Giles config
Signed-off-by: Stuart Mumford <stuart@cadair.com>
2018-07-24 11:07:11 +01:00
Travis Ralston
e6389e8ffc
Merge pull request #1445 from Cadair/gilesconfig
Add config for Giles
2018-07-23 16:16:50 -06:00
Stuart Mumford
03b74476f1
Add config for Giles
Signed-off-by: Stuart Mumford <stuart@cadair.com>
2018-07-23 20:24:12 +01: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
42447dafb4
Merge pull request #1439 from Cadair/swagger_circle
Correctly provide swagger UI as a build on Circle
2018-07-20 09:05:02 -06:00
Stuart Mumford
59bdcb5615
Clone and configure the swagger UI as a circle CI artifact
Signed-off-by: Stuart Mumford <stuart@cadair.com>
2018-07-20 15:57:44 +01:00
Ben Parsons
e7c79f2bd4 avoid .rst link conflict warnings 2018-07-20 15:30:58 +01:00
Ben Parsons
54d6d58fff naively move content from intro.rst to index.rst 2018-07-20 14:15:47 +01:00
Travis Ralston
2db970ad6d
Merge pull request #1431 from turt2live/travis/swagger-py3
Use python3 in dump-swagger.py
2018-07-19 10:26:06 -06:00
Travis Ralston
2dae0c9c49 use python3 in dump-swagger.py 2018-07-19 08:54:04 -06:00
Travis Ralston
a84a9a6af7
Merge pull request #1405 from turt2live/travis/s2s/keys-swagger
Convert server keys to swagger
2018-07-18 12:48:29 -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
2e5f530cca
Merge pull request #1373 from turt2live/travis/better-errors
Spell out rate limit error schema & give all errors schemas
2018-07-18 09:00:53 -06:00
Travis Ralston
9e6f2b2fd0 Add newsfragment 2018-07-18 08:29:13 -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
3ff1b0ddea
Merge pull request #1389 from turt2live/travis/towncrier
Use Towncrier to generate the unstable changelog
2018-07-18 08:27:02 -06:00
Ben Parsons
57ce0c3691
Merge pull request #1393 from matrix-org/travis/proposals-pagination
Improve pagination handling in proposals.py
2018-07-18 13:52:17 +01:00
Travis Ralston
98c607bff5 Advertise python 3.4 support and use that in Travis CI
We also don't need to update virtualenv, or use python3.5 specific
packages.
2018-07-17 10:28:57 -06:00
Travis Ralston
cfac4a1ab3 Use towncrier 18.6.0 final 2018-07-17 08:48:31 -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
baf19cc741 Add newsfragment for 1379 2018-07-13 10:05:21 -06:00
Travis Ralston
25678f7fd6 Merge remote-tracking branch 'matrix-org/master' into travis/towncrier 2018-07-13 10:03:43 -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
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
1e500fd005 Add newsfragment for third party network endpoints
Specifying multiple entries for the same PR would be covered under: https://github.com/hawkowl/towncrier/pull/119
2018-07-12 13:18:27 -06:00
Travis Ralston
67665fa3a6 Merge remote-tracking branch 'matrix-org/master' into travis/towncrier 2018-07-12 12:17:25 -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
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
Travis Ralston
bc29f2a8c8 Merge branch 'travis/towncrier2' into travis/towncrier 2018-07-12 10:23:17 -06:00
Travis Ralston
527a5a2fdc Require sudo
see also: https://github.com/travis-ci/travis-ci/issues/9875
2018-07-12 10:18:46 -06:00
Travis Ralston
8a4ba8c5ca Use Popen rather than run() 2018-07-12 10:16:32 -06:00
Travis Ralston
af7460088f Use six for url quoting 2018-07-12 10:07:09 -06:00