wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
992 commits 4 branches 0 tags 17 MiB
Commit graph

174 commits

Author SHA1 Message Date
Richard van der Hoff
ece42688d0 Clarify the interaction between full_state and timeout. 2015-10-26 19:20:58 +00:00
Richard van der Hoff
13eddd456f Proposal for adding full_state param to v2 sync 2015-10-26 15:52:45 +00:00
Kegsay
ade0ad5ed1 Merge pull request #129 from matrix-org/erikj/search_actual 
Add filter param to search API
 2015-10-26 10:20:56 +00:00
Erik Johnston
36634df355 Add filter param 2015-10-26 10:19:48 +00:00
Richard van der Hoff
f47a49de43 Merge pull request #126 from matrix-org/rav/send_events_api 
Add the room send and state APIs to the spec
 2015-10-23 17:05:30 +01:00
Richard van der Hoff
1945697456 Further tweaks to the room send and state APIs 
- fix confusion re empty/absent state_keys
- move 'types of room events' section earlier in the 'Events' section
- remove some redundant anchors
 2015-10-23 16:58:55 +01:00
Mark Haines
1d7cb6937f Merge pull request #123 from matrix-org/markjh/list_formatting 
Fix list formatting
 2015-10-23 16:53:29 +01:00
Mark Haines
637718108e Add newline before list 2015-10-23 16:52:37 +01:00
Richard van der Hoff
28ab643a4e Remove duplicated registration/login APIs 
Currently the spec duplicates all of the account-management APIs. There's still
work to be done here, but the complete duplication is confusing.
 2015-10-23 15:56:48 +01:00
Richard van der Hoff
587a8ba7ce Merge branch 'master' into rav/send_events_api 2015-10-23 13:48:58 +01:00
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
Mark Haines
cc14620932 Add a newline before the list 2015-10-23 11:36:07 +01:00
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