Commit graph

  • 2734f9f9f2 Merge branch 'master' into daniel/multipleexamples Daniel Wagner-Hall 2015-11-05 18:33:31 +0000
  • 161441fa3a Update 3pid spec based on new implementation Daniel Wagner-Hall 2015-11-05 18:11:20 +0000
  • 232b10b0f6 Merge branch 'master' of github.com:matrix-org/matrix-doc Daniel Wagner-Hall 2015-11-05 13:25:51 +0000
  • 8cba11b1cd Add some links to spec bugs for display names Richard van der Hoff 2015-11-05 11:06:31 +0000
  • 2fd5fc39a0 Add spec for calculating display names for rooms and users Richard van der Hoff 2015-11-05 10:55:11 +0000
  • b7cc5b1018 Merge pull request #141 from matrix-org/markjh/full_http_api_docs Mark Haines 2015-11-04 16:03:22 +0000
  • 3b7ad9a11f Merge pull request #146 from matrix-org/markjh/syntax_highlighting_message_examples Mark Haines 2015-11-04 16:02:34 +0000
  • c719946370 Enable syntax highlighting for message type examples Mark Haines 2015-11-04 11:51:50 +0000
  • 8070489080 Handle lists of types in arrays Mark Haines 2015-11-04 11:44:20 +0000
  • e49ea9015f Deduplicate tables with the same title Mark Haines 2015-11-04 11:39:36 +0000
  • 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 Mark Haines 2015-11-03 19:42:49 +0000
  • ebc0237109 Add the missing titles to the schema Mark Haines 2015-11-03 19:35:44 +0000
  • 30a4f17420 Don't mark 'aliases' on m.room.canonical_alias as required, because it isn't. Paul "LeoNerd" Evans 2015-11-03 16:15:36 +0000
  • 9f286841da Merge branch 'master' into paul/small-fixes Paul "LeoNerd" Evans 2015-11-03 16:14:31 +0000
  • d53814097f Add example content to the tags in example tag events Mark Haines 2015-11-03 15:57:06 +0000
  • 3953006792 Fix spelling Mark Haines 2015-11-03 15:54:33 +0000
  • fba3c04e42 Apparently the spec generator breaks if the title in a schema is too long Mark Haines 2015-11-03 15:48:30 +0000
  • bcb8fac53c Add a description for the tag event Mark Haines 2015-11-03 15:46:01 +0000
  • e9d361841b Fix tag examples Mark Haines 2015-11-03 15:42:58 +0000
  • 55f1602741 Merge pull request #140 from matrix-org/markjh/v2_sync_prev_content Mark Haines 2015-11-02 15:53:37 +0000
  • 2e3a0b4e00 Specify guest accounts Daniel Wagner-Hall 2015-11-02 15:26:06 +0000
  • f6c55979e0 Remove TODO comment about SYN-490 as it's unlikely to matter for v1; we'll fix it in v2 Paul "LeoNerd" Evans 2015-11-02 15:17:18 +0000
  • 40fa339cf7 Draw a pretty (well at least I think it's pretty) ASCII diagram of the remote join handshake Paul "LeoNerd" Evans 2015-11-02 15:00:18 +0000
  • 149890227a Fix wording Mark Haines 2015-11-02 13:35:11 +0000
  • 52f55e0542 Allow room tags to have asssociated content, and return that content in the m.tag events Mark Haines 2015-11-02 13:31:25 +0000
  • f557e69860 Note that m.tag events can appear in v1 initialSync and /events as well as v2 sync. Only add the room_id for v1 /events since it is redundant in v1 /initialSync Mark Haines 2015-11-02 10:13:47 +0000
  • ad86426e95 Add private_user_data to v1 room /initialSync Mark Haines 2015-10-30 16:55:18 +0000
  • b49472e3b0 Add private_user_data to v1 /initialSync Mark Haines 2015-10-30 16:52:34 +0000
  • 9f4d81308d Pull out separate invite_room_state example Daniel Wagner-Hall 2015-10-30 16:21:50 +0000
  • b8d412356e Merge branch 'daniel/3pidinvites' into daniel/multipleexamples Daniel Wagner-Hall 2015-10-30 16:20:46 +0000
  • 91eb25b76d Include the full schema for an http API in the docs by resolving references to other files Mark Haines 2015-10-30 15:45:46 +0000
  • d297d83151 Mention that sender is renamed to user_id in v1 Mark Haines 2015-10-29 18:45:53 +0000
  • 451801bf38 Add an example of `prev_content in unsigned` to v2 /sync Mark Haines 2015-10-29 18:40:05 +0000
  • d067e50af5 Document the differences in event formatting between the v1 and v2 client APIs Mark Haines 2015-10-29 18:38:33 +0000
  • cddfc110ed Review comments Daniel Wagner-Hall 2015-10-29 12:48:04 +0000
  • fa2fe2ddd9 Add event context api swagger Erik Johnston 2015-10-29 12:43:36 +0000
  • 6c1df04b4b typo Matthew Hodgson 2015-10-29 02:11:47 +0000
  • 5b6f858802 Some initial notes by way of the remote join handshake; with several TODOs and unanswered questions Paul "LeoNerd" Evans 2015-10-28 20:28:49 +0000
  • 8b0fccd691 Merge pull request #138 from matrix-org/paul/s@context@room_id@ Paul Evans 2015-10-28 18:54:26 +0000
  • a11638cc95 Merge pull request #135 from matrix-org/markjh/request_syntax_highlighting Mark Haines 2015-10-28 16:42:06 +0000
  • 810922bb38 Fix schema validator for multiple examples Daniel Wagner-Hall 2015-10-28 15:06:44 +0000
  • 176f919fc8 Show multiple examples where present Daniel Wagner-Hall 2015-10-28 15:00:53 +0000
  • 745e607577 Use 'room' or 'room ID' instead of 'context' when describing federation protocol Paul "LeoNerd" Evans 2015-10-28 14:49:50 +0000
  • b92a0f2b4d Remove extra trailing comma Daniel Wagner-Hall 2015-10-28 14:49:22 +0000
  • 81a60a25cc Update 3pid spec based on new implementation Daniel Wagner-Hall 2015-10-28 14:46:10 +0000
  • 3dd212e53b Merge pull request #133 from matrix-org/rav/full_state Richard van der Hoff 2015-10-28 14:03:58 +0000
  • ece42688d0 Clarify the interaction between full_state and timeout. Richard van der Hoff 2015-10-26 19:20:58 +0000
  • 65066a76b3 Add the m.tags event to a `private_user_data key rather than including it under the ephemeral` key Mark Haines 2015-10-26 18:30:04 +0000
  • 71874870c8 Enable syntax highlighting for example http requests Mark Haines 2015-10-26 17:25:33 +0000
  • f8275e3e4f Merge branch 'master' into markjh/room_tags Mark Haines 2015-10-26 16:47:46 +0000
  • f3fd6e92fc Merge pull request #134 from matrix-org/markjh/event_syntax_highlighting Kegsay 2015-10-26 16:43:18 +0000
  • 3f1cbb22bb Enable syntax highlighting for the JSON event examples Mark Haines 2015-10-26 16:27:57 +0000
  • 9b0d20315a Add the tags module to the specification targets Mark Haines 2015-10-26 16:22:04 +0000
  • 12e33a3b09 Document a v2 api for setting tags on rooms Mark Haines 2015-10-26 16:14:24 +0000
  • 13eddd456f Proposal for adding full_state param to v2 sync Richard van der Hoff 2015-10-26 15:52:45 +0000
  • 696f75d80b Rename section Erik Johnston 2015-10-26 14:14:13 +0000
  • e2376e9a43 Merge branch 'erikj/login_fallback_v1' of github.com:matrix-org/matrix-doc Erik Johnston 2015-10-26 14:11:21 +0000
  • 3cf431cac1 Add link Erik Johnston 2015-10-26 14:10:02 +0000
  • a22f1cd230 Merge pull request #119 from matrix-org/paul/test-vectors Kegsay 2015-10-26 14:02:42 +0000
  • 532634aff6 Merge pull request #130 from matrix-org/templating-nested-request-objects Kegsay 2015-10-26 14:01:41 +0000
  • 30d46a19d5 Review comments Kegan Dougal 2015-10-26 14:01:27 +0000
  • c0f24f5af5 Merge pull request #131 from matrix-org/erikj/login_fallback_v1 Erik Johnston 2015-10-26 14:00:39 +0000
  • 9a5bd6d21f Use static Erik Johnston 2015-10-26 13:56:07 +0000
  • 98dbf4d60b Better flow Erik Johnston 2015-10-26 13:46:41 +0000
  • 0529b4a9a2 Reword Erik Johnston 2015-10-26 13:45:36 +0000
  • 88c459d549 Add back in login v1 fallback API Erik Johnston 2015-10-26 13:40:24 +0000
  • 3b7585cbda Make nested request objects display correctly (search API) Kegan Dougal 2015-10-26 11:17:19 +0000
  • 7c250f91ff Merge pull request #127 from matrix-org/daniel/exposedrooms Daniel Wagner-Hall 2015-10-26 10:30:32 +0000
  • 1aeddac319 Cache spec output Daniel Wagner-Hall 2015-10-26 10:28:14 +0000
  • ade0ad5ed1 Merge pull request #129 from matrix-org/erikj/search_actual Kegsay 2015-10-26 10:20:56 +0000
  • 36634df355 Add filter param Erik Johnston 2015-10-26 10:18:40 +0000
  • 4823a133cd Merge pull request #124 from matrix-org/clarify_scale_crop Kegsay 2015-10-26 09:57:32 +0000
  • f47a49de43 Merge pull request #126 from matrix-org/rav/send_events_api Richard van der Hoff 2015-10-23 17:05:30 +0100
  • 1945697456 Further tweaks to the room send and state APIs Richard van der Hoff 2015-10-23 16:58:55 +0100
  • 1d7cb6937f Merge pull request #123 from matrix-org/markjh/list_formatting Mark Haines 2015-10-23 16:53:29 +0100
  • 637718108e Add newline before list Mark Haines 2015-10-23 16:52:37 +0100
  • 1401a1e2da Merge pull request #128 from matrix-org/rav/clean_up_login Richard van der Hoff 2015-10-23 16:45:28 +0100
  • 28ab643a4e Remove duplicated registration/login APIs Richard van der Hoff 2015-10-23 15:54:19 +0100
  • 67880686d5 Allow history to be noted as world-readable Daniel Wagner-Hall 2015-10-23 14:02:53 +0100
  • 587a8ba7ce Merge branch 'master' into rav/send_events_api Richard van der Hoff 2015-10-23 13:48:58 +0100
  • d2bbc461e4 mark stateKey as required in room/{id}/state Richard van der Hoff 2015-10-23 13:25:12 +0100
  • d18d406c41 Add the room send and state APIs to the spec Richard van der Hoff 2015-10-23 12:49:17 +0100
  • 0639f885df Merge pull request #125 from matrix-org/markjh/blockquote_css Mark Haines 2015-10-23 12:59:32 +0100
  • df443c10ac Move css into a css subdirectory. Mark Haines 2015-10-23 11:58:06 +0100
  • 01064369a4 Add some clarification on the difference between 'scale' and 'crop' resize methods David Baker 2015-10-23 11:57:15 +0100
  • cc14620932 Add a newline before the list Mark Haines 2015-10-23 11:36:07 +0100
  • e3e8026025 Fix list formatting so that we aren't including everything in blockquotes Mark Haines 2015-10-23 10:51:31 +0100
  • f0c74a9c83 Merge pull request #96 from matrix-org/erikj/search_actual Erik Johnston 2015-10-23 10:19:36 +0100
  • 4a558ad63b Typo Erik Johnston 2015-10-23 10:19:25 +0100
  • 879c6fc24b Merge pull request #122 from matrix-org/trustleo Daniel Wagner-Hall 2015-10-22 16:32:04 +0100
  • 82d4ea199f Trust Leo Daniel Wagner-Hall 2015-10-22 16:09:01 +0100
  • 73142fe76e Merge pull request #108 from matrix-org/appservice-swagger Kegsay 2015-10-21 11:29:59 +0100
  • f95d19cecd Merge branch 'master' into appservice-swagger Kegan Dougal 2015-10-21 09:55:53 +0100
  • 4c3e1b9ed3 Find replace fail Kegan Dougal 2015-10-21 09:53:25 +0100
  • bd539c72b4 More review comments Kegan Dougal 2015-10-21 09:52:44 +0100
  • 074c7d480c Merge pull request #113 from matrix-org/invite-room-state Kegsay 2015-10-21 09:37:44 +0100
  • 74d42f0142 Allow rejecting invitations Daniel Wagner-Hall 2015-10-20 11:08:22 +0100
  • e38e4788f2 Spell 'cryptographic' correctly Paul "LeoNerd" Evans 2015-10-19 18:29:37 +0100
  • 228acc59aa Capture cryptographic test vectors for JSON or event signing from source code Paul "LeoNerd" Evans 2015-10-19 18:26:52 +0100
  • 84a8663019 Merge pull request #115 from matrix-org/paul/event-redaction Paul Evans 2015-10-19 17:44:22 +0100