Commit graph

101 commits

Author SHA1 Message Date
Richard van der Hoff
d2bbc461e4 mark stateKey as required in room/{id}/state
Swagger insists that path params be mandatory.
2015-10-23 13:25:12 +01:00
Richard van der Hoff
d18d406c41 Add the room send and state APIs to the spec 2015-10-23 13:08:42 +01:00
Kegan Dougal
f95d19cecd Merge branch 'master' into appservice-swagger
Conflicts:
	specification/application_service_api.rst
2015-10-21 09:55:53 +01:00
Kegan Dougal
4c3e1b9ed3 Find replace fail 2015-10-21 09:53:25 +01:00
Kegan Dougal
bd539c72b4 More review comments 2015-10-21 09:52:44 +01:00
Kegan Dougal
4bb042daeb Review comments round II 2015-10-16 15:22:50 +01:00
Kegan Dougal
6770d6b2d6 Review comments 2015-10-16 14:05:18 +01:00
Kegan Dougal
f20faa80e5 Swagger validation 2015-10-15 14:58:00 +01:00
Kegan Dougal
55cc5c5bb5 Swaggerify application services 2015-10-15 14:53:03 +01:00
Kegan Dougal
5de63b4f45 Merge branch 'master' into proofing
Conflicts:
	specification/0-intro.rst
2015-10-15 11:06:30 +01:00
Kegan Dougal
1f2f14dc08 YAML tweaks 2015-10-14 17:07:25 +01:00
Kegan Dougal
84af5776d7 Newlines 2015-10-14 17:02:39 +01:00
Richard van der Hoff
4a9db39277 Clean up some untruths in the login api doc
add "type", and "username" -> "user"
2015-10-14 13:38:28 +01:00
Kegan Dougal
6f6861a11d Swaggerify the createRoom API 2015-10-14 13:17:51 +01:00
Kegan Dougal
41fb0645a9 Add message pagination API 2015-10-14 11:16:58 +01:00
Kegan Dougal
7bdb71b1c9 Tweak the syncing section
Bring together disparate sections to make it more cohesive.
2015-10-14 10:25:39 +01:00
Daniel Wagner-Hall
2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2
Conflicts:
	specification/targets.yaml
2015-10-12 18:11:01 +01:00
Kegsay
616f3990aa Merge pull request #87 from matrix-org/module-push
Push Module
2015-10-12 17:51:44 +01:00
Kegan Dougal
8f5c796884 Linkify 'pushers' 2015-10-12 17:50:46 +01:00
Mark Haines
d42c3195e6 Use 'true' rather than '1' for archived flag 2015-10-08 18:06:52 +01:00
Mark Haines
241096dc81 Add a flag to initial sync to indicate we want rooms that the user has left 2015-10-08 17:25:38 +01:00
Kegan Dougal
f2a6950cc3 Minor tweaks; allow objects without props/parents if a title is set
This allows us to do things like {Tweaks} where Tweaks is defined somewhere
else.
2015-10-08 16:21:26 +01:00
Daniel Wagner-Hall
dc3c02aff5 Review comments 2015-10-08 10:08:38 -05:00
Daniel Wagner-Hall
21a40b317d Merge branch 'master' into daniel/threepidinvites-2 2015-10-08 09:41:17 -05:00
Kegan Dougal
9c95ee5c1f Modify wording and formatting 2015-10-08 15:36:03 +01:00
Kegan Dougal
befa23624e It's dangerous to go alone, take this. 2015-10-08 13:41:47 +01:00
Kegan Dougal
65504db7bb Display nested keys on arrays of objects. Make it valid swagger. 2015-10-08 13:40:21 +01:00
Kegan Dougal
31ae4b3859 Swaggerify push notification API
Edit units.py to support nested JSON request keys
2015-10-08 13:08:21 +01:00
Kegan Dougal
a9618a981b Swaggerify the /enabled endpoint 2015-10-08 11:16:42 +01:00
Kegan Dougal
56ce432399 Get profile tag keys displaying correctly. 2015-10-08 10:14:05 +01:00
Kegan Dougal
f6da9d7760 Give valid swagger. Split out rule/ruleset to separate definitions. 2015-10-08 09:57:40 +01:00
Kegan Dougal
db25276856 Start adding in push definitions
This is going to be painful to represent due to how the push API allows
mixed types (strings or objects) and mixed top-level keys ("content" rule kind
allowing "pattern" as a top-level key). We may wish to re-visit the design
of this API for v2.
2015-10-07 17:44:05 +01:00
Kegan Dougal
9540069acd Use valid JSON 2015-10-07 16:06:11 +01:00
Kegan Dougal
c5edc60c4c Add push YAML for pushers endpoint.
Also display "required" text on required JSON body request params. Also
increase the size of the request param column to support longer param names
present in the pushers API.
2015-10-07 16:01:36 +01:00
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
Daniel Wagner-Hall
af7d2ca9fc Update 3pid invite spec
This takes into account:
 1) That finding the existing servers of a room is hard
 2) Federation
2015-10-01 22:19:11 -05:00
Daniel Wagner-Hall
d2c56fb7a3 Merge branch 'master' into daniel/threepidinvites-2 2015-10-01 21:18:50 -05: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
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
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