Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-23 17:48:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5700 commits 30 branches 42 tags 32 MiB
Commit graph

5700 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff ece42688d0 Clarify the interaction between full_state and timeout. 2015-10-26 19:20:58 +00:00
Mark Haines 65066a76b3 Add the m.tags event to a `private_user_data key rather than including it under the ephemeral` key 2015-10-26 18:30:04 +00:00
Mark Haines 71874870c8 Enable syntax highlighting for example http requests 2015-10-26 17:25:33 +00:00
Mark Haines f8275e3e4f Merge branch 'master' into markjh/room_tags 2015-10-26 16:47:46 +00:00
Kegsay f3fd6e92fc Merge pull request #134 from matrix-org/markjh/event_syntax_highlighting 
Enable syntax highlighting for the JSON event examples
 2015-10-26 16:43:18 +00:00
Mark Haines 3f1cbb22bb Enable syntax highlighting for the JSON event examples 2015-10-26 16:27:57 +00:00
Mark Haines 9b0d20315a Add the tags module to the specification targets 2015-10-26 16:22:04 +00:00
Mark Haines 12e33a3b09 Document a v2 api for setting tags on rooms 2015-10-26 16:14:24 +00:00
Richard van der Hoff 13eddd456f Proposal for adding full_state param to v2 sync 2015-10-26 15:52:45 +00:00
Erik Johnston 696f75d80b Rename section 2015-10-26 14:14:13 +00:00
Erik Johnston e2376e9a43 Merge branch 'erikj/login_fallback_v1' of github.com:matrix-org/matrix-doc 2015-10-26 14:11:21 +00:00
Erik Johnston 3cf431cac1 Add link 2015-10-26 14:10:02 +00:00
Kegsay a22f1cd230 Merge pull request #119 from matrix-org/paul/test-vectors 
Capture cryptographic test vectors for JSON or event signing from source
 2015-10-26 14:02:42 +00:00
Kegsay 532634aff6 Merge pull request #130 from matrix-org/templating-nested-request-objects 
Make nested request objects display correctly (search API)
 2015-10-26 14:01:41 +00:00
Kegan Dougal 30d46a19d5 Review comments 2015-10-26 14:01:27 +00:00
Erik Johnston c0f24f5af5 Merge pull request #131 from matrix-org/erikj/login_fallback_v1 
Add back in login v1 fallback API
 2015-10-26 14:00:39 +00:00
Erik Johnston 9a5bd6d21f Use static 2015-10-26 13:56:07 +00:00
Erik Johnston 98dbf4d60b Better flow 2015-10-26 13:46:41 +00:00
Erik Johnston 0529b4a9a2 Reword 2015-10-26 13:45:36 +00:00
Erik Johnston 88c459d549 Add back in login v1 fallback API 2015-10-26 13:40:24 +00:00
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.
 2015-10-26 11:17:19 +00:00
Daniel Wagner-Hall 7c250f91ff Merge pull request #127 from matrix-org/daniel/exposedrooms 
Allow history to be noted as world-readable
 2015-10-26 10:30:32 +00:00
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.
 2015-10-26 10:28:14 +00:00
Kegsay ade0ad5ed1 Merge pull request #129 from matrix-org/erikj/search_actual 
Add filter param to search API
 2015-10-26 10:20:56 +00:00
Erik Johnston 36634df355 Add filter param 2015-10-26 10:19:48 +00:00
Kegsay 4823a133cd Merge pull request #124 from matrix-org/clarify_scale_crop 
Clarify 'scale' & 'crop' resize methods
 2015-10-26 09:57:32 +00:00
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
 2015-10-23 17:05:30 +01:00
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
 2015-10-23 16:58:55 +01:00
Mark Haines 1d7cb6937f Merge pull request #123 from matrix-org/markjh/list_formatting 
Fix list formatting
 2015-10-23 16:53:29 +01:00
Mark Haines 637718108e Add newline before list 2015-10-23 16:52:37 +01:00
Richard van der Hoff 1401a1e2da Merge pull request #128 from matrix-org/rav/clean_up_login 
Remove duplicated registration/login APIs
 2015-10-23 16:45:28 +01:00
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.
 2015-10-23 15:56:48 +01:00
Daniel Wagner-Hall 67880686d5 Allow history to be noted as world-readable 
SPEC-237
 2015-10-23 14:02:53 +01:00
Richard van der Hoff 587a8ba7ce Merge branch 'master' into rav/send_events_api 2015-10-23 13:48:58 +01:00
Richard van der Hoff d2bbc461e4 mark stateKey as required in room/{id}/state 
Swagger insists that path params be mandatory.
 2015-10-23 13:25:12 +01:00
Richard van der Hoff d18d406c41 Add the room send and state APIs to the spec 2015-10-23 13:08:42 +01:00
Mark Haines 0639f885df Merge pull request #125 from matrix-org/markjh/blockquote_css 
Move css into a css subdirectory.
 2015-10-23 12:59:32 +01:00
Mark Haines df443c10ac Move css into a css subdirectory. 
Add css to put a bar next to blockquotes.
 2015-10-23 11:58:06 +01:00
David Baker 01064369a4 Add some clarification on the difference between 'scale' and 'crop' resize methods 2015-10-23 11:57:15 +01:00
Mark Haines cc14620932 Add a newline before the list 2015-10-23 11:36:07 +01:00
Mark Haines e3e8026025 Fix list formatting so that we aren't including everything in blockquotes 2015-10-23 10:51:31 +01:00
Erik Johnston f0c74a9c83 Merge pull request #96 from matrix-org/erikj/search_actual 
Add search API
 2015-10-23 10:19:36 +01:00
Erik Johnston 4a558ad63b Typo 2015-10-23 10:19:25 +01:00
Daniel Wagner-Hall 879c6fc24b Merge pull request #122 from matrix-org/trustleo 
Trust Leo
 2015-10-22 16:32:04 +01:00
Daniel Wagner-Hall 82d4ea199f Trust Leo 2015-10-22 16:09:01 +01:00
Kegsay 73142fe76e Merge pull request #108 from matrix-org/appservice-swagger 
Swaggerify application services
 2015-10-21 11:29:59 +01:00
Kegan Dougal f95d19cecd Merge branch 'master' into appservice-swagger 
Conflicts:
	specification/application_service_api.rst
 2015-10-21 09:55:53 +01:00
Kegan Dougal 4c3e1b9ed3 Find replace fail 2015-10-21 09:53:25 +01:00
Kegan Dougal bd539c72b4 More review comments 2015-10-21 09:52:44 +01:00
Kegsay 074c7d480c Merge pull request #113 from matrix-org/invite-room-state 
Add invite_room_state to spec
 2015-10-21 09:37:44 +01:00