Commit Graph

  • 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 markjh/event_syntax_highlighting 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 erikj/login_fallback_v1 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 templating-nested-request-objects 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
  • a95c52579c Add comment about size of cache Daniel Wagner-Hall 2015-10-26 10:27:27 +0000
  • ade0ad5ed1 Merge pull request #129 from matrix-org/erikj/search_actual Kegsay 2015-10-26 10:20:56 +0000
  • 36634df355 Add filter param erikj/search_actual 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 markjh/list_formatting 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. markjh/blockquote_css Mark Haines 2015-10-23 11:58:06 +0100
  • 01064369a4 Add some clarification on the difference between 'scale' and 'crop' resize methods clarify_scale_crop 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
  • 16c28d554c Merge branch 'master' into speculatorcache Daniel Wagner-Hall 2015-10-22 16:48:45 +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
  • 83635954c6 Cache spec output Daniel Wagner-Hall 2015-10-22 16:07:16 +0100
  • bcb6d2145d Merge 86e716d0e2 into 73142fe76e Richard van der Hoff 2015-10-21 17:10:42 +0000
  • 86e716d0e2 Fix parameter names Richard van der Hoff 2015-10-21 18:09:25 +0100
  • 356ddeae83 Update the spec to talk about v2 sync Richard van der Hoff 2015-10-21 18:02:52 +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 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
  • b3b5106ea0 Wording tweaks Daniel Wagner-Hall 2015-10-20 11:07:26 +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
  • 3e3264ca89 Allow rejecting invitations Daniel Wagner-Hall 2015-10-19 18:02:14 +0100
  • 84a8663019 Merge pull request #115 from matrix-org/paul/event-redaction Paul Evans 2015-10-19 17:44:22 +0100
  • 9252b3e1a2 Fix typo s/he/the/ Paul "LeoNerd" Evans 2015-10-19 17:44:09 +0100
  • bfa9937bdc Minor wording updates Paul "LeoNerd" Evans 2015-10-19 17:28:31 +0100
  • a9a9067d7e Merge pull request #114 from matrix-org/daniel/3pidtosigned Daniel Wagner-Hall 2015-10-19 15:52:50 +0100
  • 1d01f69c3c Merge remote-tracking branch 'origin/master' into erikj/search_actual Erik Johnston 2015-10-19 13:46:58 +0100
  • 111ca99519 Clarify that this doesn't include events that occurred after you left the room. Erik Johnston 2015-10-19 13:46:30 +0100
  • 6546068c63 Merge pull request #101 from matrix-org/spec-182-asapi-user-creation Kegsay 2015-10-19 13:39:50 +0100
  • f3088a0674 Merge branch 'master' into spec-182-asapi-user-creation spec-182-asapi-user-creation Kegan Dougal 2015-10-19 13:39:21 +0100
  • c032eafd4e Merge pull request #109 from matrix-org/registration-swagger Kegsay 2015-10-19 13:38:36 +0100
  • 26f27d95fb Merge branch 'master' into registration-swagger registration-swagger Kegan Dougal 2015-10-19 13:34:41 +0100
  • f450fc1db6 Typo Kegan Dougal 2015-10-19 13:32:43 +0100
  • bbd3f8072c Review comments invite-room-state Kegan Dougal 2015-10-19 13:28:44 +0100
  • b7355b0fa5 Merge pull request #117 from matrix-org/daniel/jenkins Daniel Wagner-Hall 2015-10-19 13:24:00 +0100
  • a2aa3cc00e Merge pull request #116 from matrix-org/room-avatar Kegsay 2015-10-19 13:19:43 +0100
  • b2aae762fc Give useful error if z-schema is missing Daniel Wagner-Hall 2015-10-19 12:36:49 +0100
  • f51e031066 Fix JSON Daniel Wagner-Hall 2015-10-19 12:36:10 +0100
  • ae90d15b3c Add m.room.avatar room-avatar Kegan Dougal 2015-10-19 10:46:07 +0100
  • c70067dd1e Simplify language Daniel Wagner-Hall 2015-10-19 10:44:26 +0100
  • cf3d75103c Merge pull request #111 from matrix-org/daniel/as Daniel Wagner-Hall 2015-10-19 10:37:21 +0100
  • 22fdb8f911 Merge branch 'master' into daniel/as Daniel Wagner-Hall 2015-10-19 10:37:12 +0100
  • 29720cd152 Initial attempt at describing the event redaction algorithm Paul "LeoNerd" Evans 2015-10-16 19:00:36 +0100
  • a38e0862cf Fix required field names Daniel Wagner-Hall 2015-10-16 18:56:07 +0100
  • 6161a920b6 Update 3pid invite section to reflect signed property Daniel Wagner-Hall 2015-10-16 18:29:20 +0100
  • 83d21484df Oopsie Kegan Dougal 2015-10-16 16:54:40 +0100
  • a8d8412068 Add invite_room_state example. Kegan Dougal 2015-10-16 16:48:18 +0100
  • d39a9082a0 Add invite_room_state to spec. Flesh out info. Kegan Dougal 2015-10-16 16:43:33 +0100
  • af8916b417 Merge 3b5aaa078d into 5881faeb83 Daniel Wagner-Hall 2015-10-16 14:59:02 +0000
  • 5881faeb83 Merge pull request #94 from matrix-org/proofing Kegsay 2015-10-16 15:58:42 +0100
  • 62d53b4f33 Review comments round III proofing Kegan Dougal 2015-10-16 15:58:11 +0100
  • 85a6a5a530 Merge branch 'master' into proofing Kegan Dougal 2015-10-16 15:23:07 +0100
  • 4bb042daeb Review comments round II Kegan Dougal 2015-10-16 15:22:50 +0100
  • 3b5aaa078d Clarify new 3pid event structure Daniel Wagner-Hall 2015-10-16 15:22:43 +0100
  • fd591f2013 Merge pull request #107 from matrix-org/proofing2 Kegsay 2015-10-16 14:19:26 +0100
  • e0fe3c42c8 Review comments Kegan Dougal 2015-10-16 14:19:00 +0100
  • 6770d6b2d6 Review comments Kegan Dougal 2015-10-16 14:05:18 +0100
  • 5282733fd4 Merge fda23d56a5 into 3146b52f83 Daniel Wagner-Hall 2015-10-16 12:19:24 +0000
  • fda23d56a5 Remove speculative lies Daniel Wagner-Hall 2015-10-16 13:19:05 +0100
  • 20b11281ea Remove lies about OAuth which doesn't exist Daniel Wagner-Hall 2015-10-16 13:10:19 +0100
  • 716c5b7a8b Add 400 and 429 response codes Erik Johnston 2015-10-16 10:26:14 +0100
  • eb59b8e9d1 Mention count Erik Johnston 2015-10-16 10:16:40 +0100
  • a6cb2e4339 Mention rank Erik Johnston 2015-10-15 16:40:21 +0100
  • eca98af896 Swaggerify /register endpoint Kegan Dougal 2015-10-15 16:38:12 +0100
  • 24e36adbe3 Mention e2e encryption Erik Johnston 2015-10-15 16:09:11 +0100