Commit Graph

978 Commits (176f919fc89f5d01669aea17003aef8da903ce4e)
 

Author SHA1 Message Date
Daniel Wagner-Hall 176f919fc8 Show multiple examples where present 10 years ago
Daniel Wagner-Hall b92a0f2b4d Remove extra trailing comma 10 years ago
Daniel Wagner-Hall 81a60a25cc Update 3pid spec based on new implementation 10 years ago
Richard van der Hoff 3dd212e53b Merge pull request #133 from matrix-org/rav/full_state
Proposal for adding full_state param to v2 sync
10 years ago
Richard van der Hoff ece42688d0 Clarify the interaction between full_state and timeout. 10 years ago
Kegsay f3fd6e92fc Merge pull request #134 from matrix-org/markjh/event_syntax_highlighting
Enable syntax highlighting for the JSON event examples
10 years ago
Mark Haines 3f1cbb22bb Enable syntax highlighting for the JSON event examples 10 years ago
Richard van der Hoff 13eddd456f Proposal for adding full_state param to v2 sync 10 years ago
Erik Johnston 696f75d80b Rename section 10 years ago
Erik Johnston e2376e9a43 Merge branch 'erikj/login_fallback_v1' of github.com:matrix-org/matrix-doc 10 years ago
Erik Johnston 3cf431cac1 Add link 10 years ago
Kegsay a22f1cd230 Merge pull request #119 from matrix-org/paul/test-vectors
Capture cryptographic test vectors for JSON or event signing from source
10 years ago
Kegsay 532634aff6 Merge pull request #130 from matrix-org/templating-nested-request-objects
Make nested request objects display correctly (search API)
10 years ago
Kegan Dougal 30d46a19d5 Review comments 10 years ago
Erik Johnston c0f24f5af5 Merge pull request #131 from matrix-org/erikj/login_fallback_v1
Add back in login v1 fallback API
10 years ago
Erik Johnston 9a5bd6d21f Use static 10 years ago
Erik Johnston 98dbf4d60b Better flow 10 years ago
Erik Johnston 0529b4a9a2 Reword 10 years ago
Erik Johnston 88c459d549 Add back in login v1 fallback API 10 years ago
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.
10 years ago
Daniel Wagner-Hall 7c250f91ff Merge pull request #127 from matrix-org/daniel/exposedrooms
Allow history to be noted as world-readable
10 years ago
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.
10 years ago
Kegsay ade0ad5ed1 Merge pull request #129 from matrix-org/erikj/search_actual
Add filter param to search API
10 years ago
Erik Johnston 36634df355 Add filter param 10 years ago
Kegsay 4823a133cd Merge pull request #124 from matrix-org/clarify_scale_crop
Clarify 'scale' & 'crop' resize methods
10 years ago
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
10 years ago
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
10 years ago
Mark Haines 1d7cb6937f Merge pull request #123 from matrix-org/markjh/list_formatting
Fix list formatting
10 years ago
Mark Haines 637718108e Add newline before list 10 years ago
Richard van der Hoff 1401a1e2da Merge pull request #128 from matrix-org/rav/clean_up_login
Remove duplicated registration/login APIs
10 years ago
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.
10 years ago
Daniel Wagner-Hall 67880686d5 Allow history to be noted as world-readable
SPEC-237
10 years ago
Richard van der Hoff 587a8ba7ce Merge branch 'master' into rav/send_events_api 10 years ago
Richard van der Hoff d2bbc461e4 mark stateKey as required in room/{id}/state
Swagger insists that path params be mandatory.
10 years ago
Richard van der Hoff d18d406c41 Add the room send and state APIs to the spec 10 years ago
Mark Haines 0639f885df Merge pull request #125 from matrix-org/markjh/blockquote_css
Move css into a css subdirectory.
10 years ago
Mark Haines df443c10ac Move css into a css subdirectory.
Add css to put a bar next to blockquotes.
10 years ago
David Baker 01064369a4 Add some clarification on the difference between 'scale' and 'crop' resize methods 10 years ago
Mark Haines cc14620932 Add a newline before the list 10 years ago
Mark Haines e3e8026025 Fix list formatting so that we aren't including everything in blockquotes 10 years ago
Erik Johnston f0c74a9c83 Merge pull request #96 from matrix-org/erikj/search_actual
Add search API
10 years ago
Erik Johnston 4a558ad63b Typo 10 years ago
Daniel Wagner-Hall 879c6fc24b Merge pull request #122 from matrix-org/trustleo
Trust Leo
10 years ago
Daniel Wagner-Hall 82d4ea199f Trust Leo 10 years ago
Kegsay 73142fe76e Merge pull request #108 from matrix-org/appservice-swagger
Swaggerify application services
10 years ago
Kegan Dougal f95d19cecd Merge branch 'master' into appservice-swagger
Conflicts:
	specification/application_service_api.rst
10 years ago
Kegan Dougal 4c3e1b9ed3 Find replace fail 10 years ago
Kegan Dougal bd539c72b4 More review comments 10 years ago
Kegsay 074c7d480c Merge pull request #113 from matrix-org/invite-room-state
Add invite_room_state to spec
10 years ago
Daniel Wagner-Hall 74d42f0142 Allow rejecting invitations 10 years ago