Mark Haines
e3e8026025
Fix list formatting so that we aren't including everything in blockquotes
2015-10-23 10:51:31 +01:00
Erik Johnston
f0c74a9c83
Merge pull request #96 from matrix-org/erikj/search_actual
...
Add search API
2015-10-23 10:19:36 +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
Erik Johnston
1d01f69c3c
Merge remote-tracking branch 'origin/master' into erikj/search_actual
2015-10-19 13:46:58 +01:00
Kegan Dougal
26f27d95fb
Merge branch 'master' into registration-swagger
...
Conflicts:
specification/client_server_api.rst
2015-10-19 13:34:41 +01:00
Kegan Dougal
f450fc1db6
Typo
2015-10-19 13:32:43 +01:00
Kegan Dougal
4bb042daeb
Review comments round II
2015-10-16 15:22:50 +01:00
Kegan Dougal
e0fe3c42c8
Review comments
2015-10-16 14:19:00 +01:00
Kegan Dougal
6770d6b2d6
Review comments
2015-10-16 14:05:18 +01:00
Erik Johnston
716c5b7a8b
Add 400 and 429 response codes
2015-10-16 10:26:14 +01:00
Kegan Dougal
eca98af896
Swaggerify /register endpoint
...
Need to move registration/login/auth sections around once #94 lands.
2015-10-15 16:38:12 +01:00
Erik Johnston
cfca4a6c09
s/creteria/criteria/
2015-10-15 15:51:02 +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
Erik Johnston
2b9484cf48
Spell things correctly
2015-10-14 15:35:39 +01:00
Erik Johnston
392a1c5ad8
Another title
2015-10-14 15:06:16 +01:00
Erik Johnston
ca9e44baac
Moar titles
2015-10-14 15:01:21 +01:00
Erik Johnston
a7a5cb088b
Add titles
2015-10-14 14:35:08 +01:00
Erik Johnston
e42c8b5b63
Add search API
2015-10-14 14:19:11 +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
Mark Haines
034241eb20
Missing symlink for the v2 swagger APIs
2015-10-06 17:43:04 +01:00
Mark Haines
509d178d58
Fix the receipts API to be valid swagger
2015-10-06 17:40:45 +01:00
Mark Haines
4f606cf3a7
Add the fields required by the templating system to v2 sync
2015-10-06 17:31:05 +01:00
Mark Haines
5a5a6565ff
Merge pull request #68 from matrix-org/markjh/v2_sync_api
...
Swagger documentation for the v2 sync API
2015-10-06 16:51:06 +01:00
