Kegsay
ead79614ff
Merge pull request #78 from matrix-org/module-typing2
...
Typing module
2015-10-02 14:36:30 +01:00
Kegan Dougal
09ac367847
Merge branch 'master' into module-content-repo
...
Conflicts:
templating/matrix_templates/units.py
2015-10-02 10:46:46 +01:00
Kegan Dougal
3d9dbe42e6
Bump to swagger-parser 3.2.1 - remove x- keys on headers
...
Removed x- keys due to https://github.com/BigstickCarpet/swagger-parser/issues/23
2015-10-02 10:21:48 +01:00
Kegan Dougal
8c4d7f5051
Do not try to parse non-json request examples as json
2015-10-01 18:03:34 +01:00
Kegan Dougal
87b6dd845e
Flesh out content repo; modify templating to support headers
...
Edit content-repo.yaml to include examples and headers.
Restructure content module to conform to the module template.
Adjust the HTTP API template to give 1 more char to the response
param to fit "Content-Disposition" correctly.
Edit the templating system to support displaying enums for
swagger APIs (before it was just JSON schema). Also add support
for introspecting headers from swagger. Finally, replace - with
_ when forming the {{ template_var }} else things whine.
2015-10-01 17:55:16 +01:00
Kegsay
8aad238cda
Merge pull request #80 from matrix-org/module-receipts
...
Receipts module
2015-10-01 17:33:38 +01:00
Kegan Dougal
da2be7eae4
Merge branch 'master' into module-voip
...
Conflicts:
specification/modules/voip_events.rst
2015-10-01 15:48:42 +01:00
Kegan Dougal
1520f3647f
Merge branch 'master' into module-typing2
...
Conflicts:
specification/modules/typing_notifications.rst
2015-10-01 15:47:46 +01:00
Kegan Dougal
c972dad8b3
Flesh out receipts module. Add receipts swagger
...
Add templating support for v2 apis.
2015-10-01 15:41:54 +01:00
Kegan Dougal
e82661413e
Add /turnServer endpoint
2015-10-01 11:04:42 +01:00
Erik Johnston
abe5d08ac6
Merge pull request #64 from matrix-org/erikj/invite_state
...
Bundle some state into invites
2015-10-01 09:25:06 +01:00
Kegan Dougal
2b7e02c080
Add sections for typing. Add swagger, JSON schema and example m.typing event
2015-09-30 15:51:04 +01:00
Erik Johnston
50e1b4c3a7
Fix up rst
2015-09-29 09:17:33 +01:00
Erik Johnston
8c22b715ca
Add title
2015-09-28 09:29:07 +01:00
Erik Johnston
37ccddb308
Typo
2015-09-25 14:25:07 +01:00
Erik Johnston
d7d9f406a6
Bundle some state into invites
2015-09-25 14:21:50 +01:00
Daniel Wagner-Hall
cd6f15f627
Remove obsolete comment
2015-09-25 13:34:24 +01:00
Daniel Wagner-Hall
0c1eb50ef4
Merge pull request #26 from matrix-org/macaroons
...
Spec macaroons and token refresh
2015-09-25 13:18:27 +01:00
Daniel Wagner-Hall
6c1491b3ba
Respond to some review comments
2015-09-25 13:17:11 +01:00
Daniel Wagner-Hall
5c4398c181
Remove superfluous comma
2015-09-25 13:10:49 +01:00
Daniel Wagner-Hall
fc87f4cdb0
Remove unused keys
2015-09-25 13:10:15 +01:00
Daniel Wagner-Hall
6c89e6ea67
Wrap refresh_token in `s
2015-09-25 13:03:46 +01:00
Mark Haines
f34722485f
Check the request example JSON matches the schema
2015-09-24 16:50:27 +01:00
Mark Haines
385b6c4759
Only validate a file if it ends with ".yaml".
...
Otherwise we try to validate vim .swp files.
2015-09-24 13:37:32 +01:00
Mark Haines
98d91d0c2b
Make the example room id more "random" so that people are less likely to think that it is supposed to be human readable
2015-09-21 17:31:35 +01:00
Mark Haines
f60190086a
Describe the behaviour of /rooms/{roomId}/member when the user has left the room
2015-09-21 17:30:10 +01:00
Mark Haines
ba6c7d267c
SPEC-216: Document the behaviour of the room getters when the user has left the room
2015-09-21 17:21:01 +01:00
Mark Haines
615a9575cb
SPEC-216: Clarify when the room getters will return 403
2015-09-21 17:12:29 +01:00
Mark Haines
cb41adee70
Fix the swagger host to be "localhost:8008" so that it can be used in a "Try it now" setup against localhost
2015-09-21 17:10:23 +01:00
Mark Haines
6a2c4d27fc
Update the docs for room v1 api
2015-09-18 17:58:44 +01:00
Mark Haines
f33c0846c3
Merge remote-tracking branch 'origin/master' into markjh/document_v1_rooms_api
2015-09-18 17:38:03 +01:00
Mark Haines
f827765ba1
Make to code to skip checking swagger responses which don't have an
...
application/json example clearer.
2015-09-18 16:35:27 +01:00
Mark Haines
9896f98e2b
Search for yaml swagger files if check_examples.py is run without
...
arguments.
2015-09-18 16:21:48 +01:00
Mark Haines
299a4356d4
Add script to check that the example responses in the swagger matches
...
the examples.
2015-09-18 16:10:21 +01:00
Mark Haines
63f08bace6
Fix the examples in the swagger API documentation to be valid JSON
2015-09-18 14:40:48 +01:00
Mark Haines
7f81501762
Allow relative references to schema to work in python and node.
...
Rename "schema/v1/core" to "schema/v1/core-event-schema".
Add self-referential symlinks to schema/v1/core-event-schema
The python json schema libraries expect that relative references are
relative to the file they are in. The node json schema libraries
expect that relateive references are relative to the first file loaded.
To support both kinds we reference the core event schema using
"core-event-schema/event.json". We then symlink the core-event-schema
directory to both the location of the file refering to "event.json" so
that it will work in python and to the location of the top level file
so that it will work in node.
2015-09-18 11:39:44 +01:00
Mark Haines
46d29e9eea
fix the room api swagger to be valid swagger
2015-09-17 16:48:07 +01:00
Mark Haines
315f97e36b
Merge branch 'master' into markjh/document_v1_rooms_api
2015-09-17 15:25:00 +01:00
Mark Haines
c49338006a
replace definitions/*event.yaml with symlinks to /event-schemas/
2015-09-17 13:09:35 +01:00
Daniel Wagner-Hall
2e9d3d283a
Swagger refresh tokens
2015-09-15 16:23:19 +01:00
Mark Haines
7eb8b4fde2
Add new-style docs for the APIs for getting events for a room
2015-09-15 15:52:36 +01:00
Daniel Wagner-Hall
59a4e84361
s/registration/login/
2015-09-14 17:10:46 +01:00
Daniel Wagner-Hall
b8e2ac5c1b
Swaggerify /login
2015-09-14 13:49:27 +01:00
Kegsay
da7c2e7fa8
Merge pull request #40 from matrix-org/markjh/history_for_rooms_that_have_been_left
...
SPEC-216: Add rooms that have been left to initial sync
2015-09-11 12:55:07 +01:00
Daniel Wagner-Hall
5b722160dd
Merge branch 'master' into daniel/threepidinvites
2015-09-10 14:05:58 +01:00
Daniel Wagner-Hall
6a56c8a965
Add trailing newline
2015-09-10 13:20:56 +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
Daniel Wagner-Hall
1b591a023e
Monospace room_id
2015-09-09 14:04:48 +01:00
Daniel Wagner-Hall
04b2b2588f
Fix up formatting and typos
2015-09-09 13:18:23 +01:00