Daniel Wagner-Hall 2502ca7ac6 Merge branch 'master' into daniel/threepidinvites-2 ... Conflicts: specification/targets.yaml		2015-10-12 18:11:01 +01:00
..
definitions	It's dangerous to go alone, take this.	2015-10-08 13:41:47 +01:00
content-repo.yaml	Bump to swagger-parser 3.2.1 - remove x- keys on headers	2015-10-02 10:21:48 +01:00
core-event-schema	Allow relative references to schema to work in python and node.	2015-09-18 11:39:44 +01:00
directory.yaml	Add profile API. Add error definition to definitions folder.	2015-05-29 15:37:44 +01:00
login.yaml	Respond to some review comments	2015-09-25 13:17:11 +01:00
membership.yaml	Review comments	2015-10-08 10:08:38 -05:00
presence.yaml	Fix the examples in the swagger API documentation to be valid JSON	2015-09-18 14:40:48 +01:00
profile.yaml	Add sortFn for profile HTTP API. Add combined profile HTTP API.	2015-06-01 16:29:19 +01:00
push_notifier.yaml	Minor tweaks; allow objects without props/parents if a title is set	2015-10-08 16:21:26 +01:00
pusher.yaml	Linkify 'pushers'	2015-10-12 17:50:46 +01:00
pushrules.yaml	Display nested keys on arrays of objects. Make it valid swagger.	2015-10-08 13:40:21 +01:00
rooms.yaml	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
sync.yaml	Use 'true' rather than '1' for archived flag	2015-10-08 18:06:52 +01:00
typing.yaml	Add sections for typing. Add swagger, JSON schema and example m.typing event	2015-09-30 15:51:04 +01:00
v1-event-schema	Allow relative references to schema to work in python and node.	2015-09-18 11:39:44 +01:00
voip.yaml	Add /turnServer endpoint	2015-10-01 11:04:42 +01:00