Mark Haines
a33e49fd1e
Merge pull request #224 from matrix-org/markjh/filter_inline
...
Allow the filter JSON to be passed inline in the /sync request
2015-12-09 11:53:43 +00:00
Mark Haines
c3a1318886
Make it explicit that the JSON filter object is passed as a string
2015-12-09 10:50:02 +00:00
Erik Johnston
c96848d1bc
Merge pull request #169 from matrix-org/erikj/search_yet_agian
...
Search: Document event context, groups and orders.
2015-12-08 16:11:03 +00:00
Erik Johnston
95255bcdf5
Use rst not html
2015-12-08 16:02:55 +00:00
Erik Johnston
e1fda6b6b6
Remove double the
2015-12-08 15:35:59 +00:00
Erik Johnston
9c98c80bde
Fix up filter description
2015-12-08 15:26:06 +00:00
Mark Haines
ed70bcb180
Add a rationale for allowing both inline filters and passing filters by id.
2015-12-08 14:36:50 +00:00
Mark Haines
878ce2f206
Allow the filter JSON to be passed inline in the /sync request
2015-12-08 14:32:11 +00:00
Erik Johnston
6025569a73
Remove unused 403 stub
2015-12-08 14:10:45 +00:00
Erik Johnston
0fb88e26f0
Add tags
2015-12-08 14:07:08 +00:00
Erik Johnston
4290882034
Remove superfluous quote
2015-12-08 14:06:59 +00:00
Erik Johnston
8e7f6d44f6
Remove v1 references
2015-12-08 14:01:16 +00:00
Erik Johnston
4967b092aa
Add description of state response key
2015-12-08 13:37:32 +00:00
Erik Johnston
f4b9433c7b
Better wording
2015-12-07 16:33:48 +00:00
Erik Johnston
584104c432
Make example valid event id
2015-12-07 16:32:43 +00:00
Erik Johnston
fda07e0d41
Merge remote-tracking branch 'origin/master' into erikj/event_context_api
2015-12-07 16:31:55 +00:00
Erik Johnston
856dd9100e
Merge remote-tracking branch 'origin/master' into erikj/search_yet_agian
2015-12-07 16:28:14 +00:00
Erik Johnston
118a6aa040
Reword groupings descriptions
2015-12-07 16:06:25 +00:00
Erik Johnston
1ef9cc37e3
Typo
2015-12-07 15:58:31 +00:00
Erik Johnston
fca8e5abe7
Add top level next_batch key to example
2015-12-07 15:54:08 +00:00
Daniel Wagner-Hall
f81b967e2d
Make all the schema files yaml
2015-12-07 13:56:36 +00:00
Daniel Wagner-Hall
1f5b6271f2
Generate swagger-ui output for client-server API
...
Depends on:
https://github.com/matrix-org/matrix-doc/pull/212
https://github.com/matrix-org/matrix-doc/pull/208
https://github.com/matrix-org/matrix-doc/pull/207
for the actual rendered output to not throw javascript errors at runtime.
2015-12-07 12:45:13 +00:00
Daniel Wagner-Hall
c9fee294df
Merge pull request #211 from matrix-org/daniel/extractas
...
Move application service swagger out of c-s dir
2015-12-07 12:00:27 +00:00
Daniel Wagner-Hall
97579f15cb
Merge pull request #212 from matrix-org/daniel/pushdictification
...
Take object, not bool, as param
2015-12-07 10:39:36 +00:00
Daniel Wagner-Hall
705556634a
Add filters
2015-12-04 19:46:45 +00:00
Daniel Wagner-Hall
9c733a45e8
Take object, not bool, as param
...
Throughout our API we take objects. And swagger is unhappy with not
doing so.
2015-12-04 17:36:19 +00:00
Daniel Wagner-Hall
614ee9ea1b
Move application service swagger out of c-s dir
2015-12-04 17:34:48 +00:00
Mark Haines
140206ca69
s/archived/leave/
2015-12-04 17:32:59 +00:00
Mark Haines
79d109f7cc
Add an flag to control whether rooms the user has left are included in the sync
2015-12-04 16:44:11 +00:00
Daniel Wagner-Hall
e0ebabf8cc
Explicitly document /rooms/{roomId}/state/{eventType} without state key
2015-12-04 11:42:19 +00:00
Daniel Wagner-Hall
873b0dcecf
Replace version numbers with release numbers
2015-12-04 11:09:35 +00:00
Daniel Wagner-Hall
f308b7543c
Specify /admin/whois/{userId}
2015-12-03 16:26:45 +00:00
Daniel Wagner-Hall
19ce17cfed
Merge pull request #200 from matrix-org/daniel/redact
...
Merge pull request #200 from matrix-org/daniel/redact
2015-12-03 15:57:52 +00:00
Daniel Wagner-Hall
2f3a00fe34
Consistently spell homeserver as homeserver
2015-12-02 19:23:33 +00:00
Daniel Wagner-Hall
e072d215cf
Specify redaction
2015-12-02 15:27:25 +00:00
Daniel Wagner-Hall
7f07da4b50
Remove obsolete documentation
2015-12-01 17:29:09 +00:00
Daniel Wagner-Hall
aa4ed10821
Unify v1 and v2 event schemas
2015-12-01 17:23:58 +00:00
Daniel Wagner-Hall
681c258206
Fix turnServer endpoint
2015-12-01 16:56:28 +00:00
Erik Johnston
ca7ef1b536
Update Results description
2015-12-01 15:34:25 +00:00
Erik Johnston
5e8bb34f36
Change the results dict to a list
2015-12-01 15:33:13 +00:00
Erik Johnston
46fd0b252c
Merge branch 'master' of github.com:matrix-org/matrix-doc into erikj/search_yet_agian
2015-12-01 15:06:13 +00:00
Daniel Wagner-Hall
c6e0322a9e
Swaggerify /account
2015-12-01 13:53:03 +00:00
Daniel Wagner-Hall
6c66bfc755
Flatten out v1 and v2_alpha directories
...
As a side effect, I got rid of all of the horrible symlinks and just put
in all of the proper relative paths. Because the horrible symlinks were
horrible.
2015-11-30 11:22:57 +00:00
Daniel Wagner-Hall
3951785f19
Fix alias path
2015-11-27 16:23:31 +00:00
Daniel Wagner-Hall
bc514dc9c4
Merge pull request #178 from matrix-org/daniel/directory
...
Fix and include /directory api docs
2015-11-27 16:21:15 +00:00
Daniel Wagner-Hall
7f2813354d
Swaggerify /ban
2015-11-27 15:42:21 +00:00
Mark Haines
a20a49abf6
Merge pull request #168 from matrix-org/markjh/client_config
...
Add API for setting client config
2015-11-27 15:32:21 +00:00
Mark Haines
c5f457cee9
Merge pull request #132 from matrix-org/markjh/room_tags
...
Document a v2 api for setting tags on rooms
2015-11-27 15:31:54 +00:00
Daniel Wagner-Hall
f0c99a6925
Generate API docs from swagger
2015-11-27 15:03:22 +00:00
Mark Haines
c539b208f9
Merge branch 'markjh/room_tags' into markjh/client_config
...
Conflicts:
api/client-server/v2_alpha/sync.yaml
2015-11-26 16:56:39 +00:00
