Commit graph

  • 122c082fcf Comment about origin servers of invites having subsequently left the room Paul "LeoNerd" Evans 2015-11-16 16:29:43 +0000
  • 2b19b50f4f Merge pull request #167 from matrix-org/more_nesting Kegsay 2015-11-16 16:10:55 +0000
  • e2eb0c7ad9 Add new request options Erik Johnston 2015-11-16 16:04:23 +0000
  • 923f05e554 More consistency around 'resident homeserver' Paul "LeoNerd" Evans 2015-11-16 15:34:11 +0000
  • 36af793f05 s/full object/full event/ Paul "LeoNerd" Evans 2015-11-16 15:30:22 +0000
  • 8648f86032 Moar spaces Kegan Dougal 2015-11-16 15:08:37 +0000
  • 96be7ff241 Support more nesting Erik Johnston 2015-11-16 15:00:31 +0000
  • e1b12a753e Fix typos and missing file Richard van der Hoff 2015-11-16 00:17:22 +0000
  • 29bd4d45ee Flatten the response to /sync Richard van der Hoff 2015-11-15 23:40:41 +0000
  • b41d771c15 Fix typos in /sync example response Richard van der Hoff 2015-11-15 23:58:04 +0000
  • 57995a815a Fix a number of untruths in the documentation about /sync. Richard van der Hoff 2015-11-15 23:30:29 +0000
  • 3f0262081c Update sync API defn to reflect SPEC-254 changes Richard van der Hoff 2015-11-11 19:22:38 +0000
  • 838af2a23e Updates to swagger table generation Richard van der Hoff 2015-11-15 17:21:56 +0000
  • cc8ef691fb Rewrite the table templates Richard van der Hoff 2015-11-15 16:49:22 +0000
  • 988d773476 /make_join protoevent no longer needs the pointless 'prev_state' key (SYN-517) Paul "LeoNerd" Evans 2015-11-13 17:49:22 +0000
  • 885dd1e86c Explain the 'prev_events' join protoevent key Paul "LeoNerd" Evans 2015-11-13 16:39:31 +0000
  • db5a90edcd Avoid using the words 'current state' when talking about the result of the /make_join request Paul "LeoNerd" Evans 2015-11-13 16:36:26 +0000
  • aac45295ee Remark that the directory server step could be skipped in an invite case Paul "LeoNerd" Evans 2015-11-13 16:34:22 +0000
  • d7c69fae43 Fix typo 'process' Paul "LeoNerd" Evans 2015-11-13 16:33:34 +0000
  • ea364a108b Merge pull request #161 from matrix-org/daniel/guestdisplaynames Daniel Wagner-Hall 2015-11-12 13:23:49 +0000
  • c5e4d08e3b Merge pull request #158 from matrix-org/daniel/guestroominitialsync Daniel Wagner-Hall 2015-11-12 13:20:39 +0000
  • 29d9c8eec6 Guests are allowed to set displaynames Daniel Wagner-Hall 2015-11-12 12:05:02 +0000
  • 4d3175fc8b Note that invite_room_state is optional Daniel Wagner-Hall 2015-11-12 10:45:57 +0000
  • 061105c9dc Guest users are allowed room initialSync Daniel Wagner-Hall 2015-11-11 17:18:58 +0000
  • 703b9d456b Merge pull request #157 from matrix-org/daniel/specfetch Daniel Wagner-Hall 2015-11-11 15:25:04 +0000
  • 0f0359d9c1 speculator: Nessle up some more if statements Daniel Wagner-Hall 2015-11-11 15:13:34 +0000
  • 567ba6d22d Merge pull request #156 from matrix-org/daniel/specfetch Daniel Wagner-Hall 2015-11-11 15:11:51 +0000
  • 740cc66a7c speculator: Fetch before deciding head is fresh Daniel Wagner-Hall 2015-11-11 14:01:45 +0000
  • a80fcfa83b Merge pull request #155 from matrix-org/daniel/publicwritable2 Daniel Wagner-Hall 2015-11-11 11:53:37 +0000
  • dcf54e11b1 Specify /publicRooms world_readable and guest_access Daniel Wagner-Hall 2015-11-11 11:53:31 +0000
  • b6a4dfa7cd Merge pull request #154 from matrix-org/daniel/publicwritable Daniel Wagner-Hall 2015-11-11 11:39:42 +0000
  • d7357ef9b7 Specify /publicRooms Daniel Wagner-Hall 2015-11-11 11:39:40 +0000
  • 27ffe7bacd Don't serve rst diffs as HTML Daniel Wagner-Hall 2015-11-10 15:34:32 +0000
  • c00abe9f2f Fix msgtype display Daniel Wagner-Hall 2015-11-10 15:26:51 +0000
  • 071edcd86e Merge branch 'master' into daniel/multipleexamples Daniel Wagner-Hall 2015-11-10 13:22:35 +0000
  • 624756fb9a Merge pull request #153 from matrix-org/daniel/3pidyetagain Daniel Wagner-Hall 2015-11-10 12:44:13 +0000
  • bdf755632e Merge pull request #152 from matrix-org/daniel/macaroons Daniel Wagner-Hall 2015-11-10 12:43:36 +0000
  • c8f6ed1107 More formatting.. Kegsay 2015-11-10 11:31:31 +0000
  • 51fe4a90b6 More formatting fixes Kegsay 2015-11-10 11:28:27 +0000
  • c1866ebebc Fix table formatting Kegsay 2015-11-10 11:26:06 +0000
  • 24c2036a35 3pid invites: remove mentions of display_name Daniel Wagner-Hall 2015-11-09 17:30:18 +0000
  • 68bec3a61a Merge pull request #151 from matrix-org/daniel/continuservconcurrency Daniel Wagner-Hall 2015-11-09 16:11:56 +0000
  • c3608b3a69 Merge branch 'master' into daniel/continuservconcurrency Daniel Wagner-Hall 2015-11-09 16:11:34 +0000
  • 436a35e9f6 Document macaroon type=login Daniel Wagner-Hall 2015-11-09 16:04:31 +0000
  • e72151f2c3 Specify guest room access Daniel Wagner-Hall 2015-11-06 18:15:21 +0000
  • 16b91086b0 Merge pull request #149 from matrix-org/daniel/continuservcontenttype Daniel Wagner-Hall 2015-11-06 17:26:58 +0000
  • bbf9e229a7 continuserv: guard concurrent accesses to wg Daniel Wagner-Hall 2015-11-06 16:09:09 +0000
  • 1be5b856bd Preserve text/plain for errors Daniel Wagner-Hall 2015-11-06 16:05:07 +0000
  • 7f6eafdce5 continuserv: set Content-Type header Daniel Wagner-Hall 2015-11-06 14:46:55 +0000
  • d5f96af1f1 Merge branch 'master' into daniel/multipleexamples Daniel Wagner-Hall 2015-11-06 14:21:28 +0000
  • cfdcf9e5a3 Merge pull request #148 from matrix-org/daniel/leadingspacesucks Daniel Wagner-Hall 2015-11-06 11:46:41 +0000
  • 937ff046d8 Force / to be HTML too Daniel Wagner-Hall 2015-11-05 19:21:16 +0000
  • 559747e77a speculator: Sent Content-Type: text/html header Daniel Wagner-Hall 2015-11-05 19:18:28 +0000
  • 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