Commit Graph

1005 Commits (2734f9f9f2bf0240c225f5132761db3d481631ee)
 

Author SHA1 Message Date
Daniel Wagner-Hall 2734f9f9f2 Merge branch 'master' into daniel/multipleexamples
Conflicts:
	specification/modules/third_party_invites.rst
9 years ago
Daniel Wagner-Hall 161441fa3a Update 3pid spec based on new implementation 9 years ago
Daniel Wagner-Hall 232b10b0f6 Merge branch 'master' of github.com:matrix-org/matrix-doc 9 years ago
Richard van der Hoff 8cba11b1cd Add some links to spec bugs for display names
Just added a couple of TODO comments to useful jira bugs
9 years ago
Richard van der Hoff 2fd5fc39a0 Add spec for calculating display names for rooms and users
Merged from https://github.com/matrix-org/matrix-doc/pull/145
9 years ago
Mark Haines b7cc5b1018 Merge pull request #141 from matrix-org/markjh/full_http_api_docs
Include the full schema for an http API in the docs
9 years ago
Mark Haines 3b7ad9a11f Merge pull request #146 from matrix-org/markjh/syntax_highlighting_message_examples
Enable syntax highlighting for message type examples
9 years ago
Mark Haines c719946370 Enable syntax highlighting for message type examples 9 years ago
Mark Haines 8070489080 Handle lists of types in arrays 9 years ago
Mark Haines e49ea9015f Deduplicate tables with the same title 9 years ago
Mark Haines 8322151661 Don't put a space when appending the "Must be" strings to the desciption if there isn't a description, otherwise it will mess up the indent 9 years ago
Mark Haines ebc0237109 Add the missing titles to the schema 9 years ago
Mark Haines 55f1602741 Merge pull request #140 from matrix-org/markjh/v2_sync_prev_content
Document the differences in event formatting between the v1 and v2 event format.
9 years ago
Daniel Wagner-Hall 2e3a0b4e00 Specify guest accounts 9 years ago
Daniel Wagner-Hall 9f4d81308d Pull out separate invite_room_state example 9 years ago
Daniel Wagner-Hall b8d412356e Merge branch 'daniel/3pidinvites' into daniel/multipleexamples 9 years ago
Mark Haines 91eb25b76d Include the full schema for an http API in the docs by resolving references to other files 9 years ago
Mark Haines d297d83151 Mention that sender is renamed to user_id in v1 9 years ago
Mark Haines 451801bf38 Add an example of ``prev_content`` in ``unsigned`` to v2 /sync 9 years ago
Mark Haines d067e50af5 Document the differences in event formatting between the v1 and v2 client APIs 9 years ago
Daniel Wagner-Hall cddfc110ed Review comments 9 years ago
Matthew Hodgson 6c1df04b4b typo 9 years ago
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
9 years ago
Mark Haines a11638cc95 Merge pull request #135 from matrix-org/markjh/request_syntax_highlighting
Enable syntax highlighting for example http requests
9 years ago
Daniel Wagner-Hall 810922bb38 Fix schema validator for multiple examples 9 years ago
Daniel Wagner-Hall 176f919fc8 Show multiple examples where present 9 years ago
Paul "LeoNerd" Evans 745e607577 Use 'room' or 'room ID' instead of 'context' when describing federation protocol 9 years ago
Daniel Wagner-Hall b92a0f2b4d Remove extra trailing comma 9 years ago
Daniel Wagner-Hall 81a60a25cc Update 3pid spec based on new implementation 9 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
9 years ago
Richard van der Hoff ece42688d0 Clarify the interaction between full_state and timeout. 9 years ago
Mark Haines 71874870c8 Enable syntax highlighting for example http requests 9 years ago
Kegsay f3fd6e92fc Merge pull request #134 from matrix-org/markjh/event_syntax_highlighting
Enable syntax highlighting for the JSON event examples
9 years ago
Mark Haines 3f1cbb22bb Enable syntax highlighting for the JSON event examples 9 years ago
Richard van der Hoff 13eddd456f Proposal for adding full_state param to v2 sync 9 years ago
Erik Johnston 696f75d80b Rename section 9 years ago
Erik Johnston e2376e9a43 Merge branch 'erikj/login_fallback_v1' of github.com:matrix-org/matrix-doc 9 years ago
Erik Johnston 3cf431cac1 Add link 9 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
9 years ago
Kegsay 532634aff6 Merge pull request #130 from matrix-org/templating-nested-request-objects
Make nested request objects display correctly (search API)
9 years ago
Kegan Dougal 30d46a19d5 Review comments 9 years ago
Erik Johnston c0f24f5af5 Merge pull request #131 from matrix-org/erikj/login_fallback_v1
Add back in login v1 fallback API
9 years ago
Erik Johnston 9a5bd6d21f Use static 9 years ago
Erik Johnston 98dbf4d60b Better flow 9 years ago
Erik Johnston 0529b4a9a2 Reword 9 years ago
Erik Johnston 88c459d549 Add back in login v1 fallback API 9 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.
9 years ago
Daniel Wagner-Hall 7c250f91ff Merge pull request #127 from matrix-org/daniel/exposedrooms
Allow history to be noted as world-readable
9 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.
9 years ago
Kegsay ade0ad5ed1 Merge pull request #129 from matrix-org/erikj/search_actual
Add filter param to search API
9 years ago