Commit graph

1203 commits

Author SHA1 Message Date
Mark Haines
451801bf38 Add an example of `prev_content in unsigned` to v2 /sync 2015-10-29 18:40:05 +00:00
Mark Haines
d067e50af5 Document the differences in event formatting between the v1 and v2 client APIs 2015-10-29 18:38:33 +00:00
Daniel Wagner-Hall
cddfc110ed Review comments 2015-10-29 12:48:04 +00:00
Matthew Hodgson
6c1df04b4b typo 2015-10-29 02:11:47 +00:00
Paul "LeoNerd" Evans
5b6f858802 Some initial notes by way of the remote join handshake; with several TODOs and unanswered questions 2015-10-28 20:28:49 +00:00
Paul Evans
8b0fccd691 Merge pull request #138 from matrix-org/paul/s@context@room_id@
Use 'room' or 'room ID' instead of 'context' when describing federation protocol
2015-10-28 18:54:26 +00:00
Mark Haines
a11638cc95 Merge pull request #135 from matrix-org/markjh/request_syntax_highlighting
Enable syntax highlighting for example http requests
2015-10-28 16:42:06 +00:00
Daniel Wagner-Hall
810922bb38 Fix schema validator for multiple examples 2015-10-28 15:06:44 +00:00
Daniel Wagner-Hall
176f919fc8 Show multiple examples where present 2015-10-28 15:00:53 +00:00
Paul "LeoNerd" Evans
745e607577 Use 'room' or 'room ID' instead of 'context' when describing federation protocol 2015-10-28 14:49:50 +00:00
Daniel Wagner-Hall
b92a0f2b4d Remove extra trailing comma 2015-10-28 14:49:41 +00:00
Daniel Wagner-Hall
81a60a25cc Update 3pid spec based on new implementation 2015-10-28 14:46:10 +00:00
Richard van der Hoff
3dd212e53b Merge pull request #133 from matrix-org/rav/full_state
Proposal for adding full_state param to v2 sync
2015-10-28 14:03:58 +00:00
Richard van der Hoff
ece42688d0 Clarify the interaction between full_state and timeout. 2015-10-26 19:20:58 +00:00
Mark Haines
65066a76b3 Add the m.tags event to a `private_user_data key rather than including it under the ephemeral` key 2015-10-26 18:30:04 +00:00
Mark Haines
71874870c8 Enable syntax highlighting for example http requests 2015-10-26 17:25:33 +00:00
Mark Haines
f8275e3e4f Merge branch 'master' into markjh/room_tags 2015-10-26 16:47:46 +00:00
Kegsay
f3fd6e92fc Merge pull request #134 from matrix-org/markjh/event_syntax_highlighting
Enable syntax highlighting for the JSON event examples
2015-10-26 16:43:18 +00:00
Mark Haines
3f1cbb22bb Enable syntax highlighting for the JSON event examples 2015-10-26 16:27:57 +00:00
Mark Haines
9b0d20315a Add the tags module to the specification targets 2015-10-26 16:22:04 +00:00
Mark Haines
12e33a3b09 Document a v2 api for setting tags on rooms 2015-10-26 16:14:24 +00:00
Richard van der Hoff
13eddd456f Proposal for adding full_state param to v2 sync 2015-10-26 15:52:45 +00:00
Erik Johnston
696f75d80b Rename section 2015-10-26 14:14:13 +00:00
Erik Johnston
e2376e9a43 Merge branch 'erikj/login_fallback_v1' of github.com:matrix-org/matrix-doc 2015-10-26 14:11:21 +00:00
Erik Johnston
3cf431cac1 Add link 2015-10-26 14:10:02 +00:00
Kegsay
a22f1cd230 Merge pull request #119 from matrix-org/paul/test-vectors
Capture cryptographic test vectors for JSON or event signing from source
2015-10-26 14:02:42 +00:00
Kegsay
532634aff6 Merge pull request #130 from matrix-org/templating-nested-request-objects
Make nested request objects display correctly (search API)
2015-10-26 14:01:41 +00:00
Kegan Dougal
30d46a19d5 Review comments 2015-10-26 14:01:27 +00:00
Erik Johnston
c0f24f5af5 Merge pull request #131 from matrix-org/erikj/login_fallback_v1
Add back in login v1 fallback API
2015-10-26 14:00:39 +00:00
Erik Johnston
9a5bd6d21f Use static 2015-10-26 13:56:07 +00:00
Erik Johnston
98dbf4d60b Better flow 2015-10-26 13:46:41 +00:00
Erik Johnston
0529b4a9a2 Reword 2015-10-26 13:45:36 +00:00
Erik Johnston
88c459d549 Add back in login v1 fallback API 2015-10-26 13:40:24 +00:00
Kegan Dougal
3b7585cbda Make nested request objects display correctly (search API)
This now displays search_categories.room_events.filter and co correctly.
Also make arrays of enums display correctly.
2015-10-26 11:17:19 +00:00
Daniel Wagner-Hall
7c250f91ff Merge pull request #127 from matrix-org/daniel/exposedrooms
Allow history to be noted as world-readable
2015-10-26 10:30:32 +00:00
Daniel Wagner-Hall
1aeddac319 Cache spec output
Does not cache inability to generate spec. Does not cache diffs or
anything fancy. Just the raw spec generation.
2015-10-26 10:28:14 +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
Kegsay
4823a133cd Merge pull request #124 from matrix-org/clarify_scale_crop
Clarify 'scale' & 'crop' resize methods
2015-10-26 09:57:32 +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
1401a1e2da Merge pull request #128 from matrix-org/rav/clean_up_login
Remove duplicated registration/login APIs
2015-10-23 16:45:28 +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
Daniel Wagner-Hall
67880686d5 Allow history to be noted as world-readable
SPEC-237
2015-10-23 14:02:53 +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
0639f885df Merge pull request #125 from matrix-org/markjh/blockquote_css
Move css into a css subdirectory.
2015-10-23 12:59:32 +01:00