Commit graph

478 commits

Author SHA1 Message Date
Daniel Wagner-Hall 5b722160dd Merge branch 'master' into daniel/threepidinvites 2015-09-10 14:05:58 +01:00
Kegsay b9c04cd9ca Merge pull request #38 from matrix-org/newlines
Preserve newlines in wrapped text
2015-09-10 13:59:18 +01:00
Daniel Wagner-Hall 99106bb6fe Add explanatory comments
Also, remove line which was accidentally removed
2015-09-10 13:54:00 +01:00
Daniel Wagner-Hall cdc06a8bf1 Document --nodelete 2015-09-10 13:53:38 +01:00
Daniel Wagner-Hall a74fb54053 Correct comment 2015-09-10 13:44:41 +01:00
Daniel Wagner-Hall ad595aea45 Optionally don't delete intermediate rst files
Useful for debugging
Hackily hackily implemented :)
2015-09-10 13:21:08 +01:00
Daniel Wagner-Hall 6a56c8a965 Add trailing newline 2015-09-10 13:20:56 +01:00
Daniel Wagner-Hall f67e27e843 Split on double-newlines not single
Otherwise all sorts of tables get horribly broken
2015-09-10 13:20:04 +01:00
Daniel Wagner-Hall 55f33736b2 Preserve newlines in wrapped text 2015-09-10 12:04:12 +01:00
Daniel Wagner-Hall a548148563 Invite doesn't accept room aliases 2015-09-10 11:21:18 +01:00
Daniel Wagner-Hall 2797fac3aa Swagger /room/{roomId}/invite
This is a transcription of the current spec, with nothing new or
controversial in it.
2015-09-09 17:55:40 +01:00
Kegsay cf3475515e Merge pull request #33 from matrix-org/daniel/threepidinvites
Spec /room/{roomId}/join
2015-09-09 16:56:43 +01:00
Kegsay 8ebe2377fe Merge pull request #34 from matrix-org/daniel/endpointaliases
Add ability to refer to aliases of endpoints
2015-09-09 14:15:36 +01:00
Daniel Wagner-Hall 1b591a023e Monospace room_id 2015-09-09 14:04:48 +01:00
Kegsay 38d50b4a78 Merge pull request #35 from matrix-org/daniel/gitignore
Add api/node_modules to .gitignore
2015-09-09 13:45:12 +01:00
Daniel Wagner-Hall 267d2bd3de Add api/node_modules to .gitignore 2015-09-09 13:40:32 +01:00
Daniel Wagner-Hall 04b2b2588f Fix up formatting and typos 2015-09-09 13:18:23 +01:00
Daniel Wagner-Hall d399e5b93b Use an alias object rather than flat fields 2015-09-09 13:16:46 +01:00
Daniel Wagner-Hall 64cfc00f50 Remove unused fluff 2015-09-08 17:07:52 +01:00
Daniel Wagner-Hall 1feb9565e4 Use other-way-around alias format 2015-09-08 17:04:08 +01:00
Daniel Wagner-Hall 90f5dc370b Populate aliases from canonical endpoint
Swagger validates badly if you have endpoints without the full
specification of things, so instead let's generate them the other way
around.
2015-09-08 16:59:18 +01:00
Daniel Wagner-Hall d53943c8c2 Spec /room/{roomId}/join
This is just replacing the existing spec with a swagger version.

Subsequent pull requests will add 3pid join to this, as well as specing
the invite, leave, ban, and kick endpoints.
2015-09-08 16:35:08 +01:00
Daniel Wagner-Hall 26ebe3e68b Add ability to refer to aliases of endpoints 2015-09-08 16:27:20 +01:00
Kegsay 96a77d7449 Merge pull request #31 from matrix-org/daniel/specformat
Show all responses, not just the successful one
2015-09-08 11:54:56 +01:00
Daniel Wagner-Hall 5031c26f7b Make res optional, and rename to good_response 2015-09-08 11:25:03 +01:00
Daniel Wagner-Hall 0a9f61029a Allow for missing responses key 2015-09-08 11:16:48 +01:00
Daniel Wagner-Hall 94b13c0121 Show all responses, not just the successful one
This still filters out responses lacking either a description or an
example
2015-09-07 17:14:36 +01:00
Kegsay ec5342eeb9 Merge pull request #30 from matrix-org/daniel/generrors
Output error if command fails
2015-09-07 16:44:39 +01:00
Daniel Wagner-Hall 0414ff4cc3 Output error if command fails 2015-09-07 16:27:18 +01:00
Oddvar Lovaas 1284f3f092 glue footer to the bottom 2015-09-04 17:53:39 +01:00
Oddvar Lovaas 362a081d68 css wrangling 2015-09-04 16:32:20 +01:00
Kegsay 5e7665054e Merge pull request #28 from matrix-org/history_visibility
Document m.room.history_visibility
2015-09-04 13:33:51 +01:00
Erik Johnston b4c2cba406 State key should be empty 2015-09-04 13:31:51 +01:00
Erik Johnston 1e3d9a6a50 Typo 2015-09-04 13:30:11 +01:00
Erik Johnston c6d143447b Add schemas 2015-09-04 13:27:01 +01:00
Kegsay 99a4c198f4 Merge pull request #29 from matrix-org/erikj/canonical_alias
Document the canonical alias event
2015-09-04 11:56:12 +01:00
Erik Johnston 40f037da55 Get the right type 2015-09-04 11:54:53 +01:00
Erik Johnston 3aabb77cb4 Capitilasation matters 2015-09-04 11:53:07 +01:00
Erik Johnston 61f1424124 No trailing commas 2015-09-04 11:51:13 +01:00
Erik Johnston 03b8c7a12b Document the canonical alias event 2015-09-04 11:43:11 +01:00
Erik Johnston 80bb51d9bb Make it clearer 2015-09-04 11:21:14 +01:00
Erik Johnston 4b24b887c7 Document m.room.history_visibility 2015-09-01 11:53:30 +01:00
Oddvar Lovaas 16ff77adf9 AS guide and index page added 2015-08-24 10:39:59 +01:00
Oddvar Lovaas 4a2c2d015f indent or die 2015-08-19 17:18:58 +01:00
Oddvar Lovaas ade068f7ec date and URL change 2015-08-19 17:12:56 +01:00
Oddvar Lovaas 65194befe8 ...and associated css 2015-08-19 17:01:40 +01:00
Oddvar Lovaas 803b3e9146 FAQ converted from WP 2015-08-19 17:00:26 +01:00
Oddvar Lovaas b24582aead Introducing jekyll (jekyllrb.com) for docs 2015-08-14 11:03:15 +01:00
Paul Evans 9957e18d31 Merge pull request #25 from matrix-org/paul/fixes
Rename 'perspective server' to 'notary server'
2015-08-05 11:44:21 +01:00
Paul "LeoNerd" Evans 49c52a96a7 Rename 'perspective server' to 'notary server' as that's what the Perspectives Project calls them too 2015-08-05 11:35:48 +01:00