Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-24 09:58:38 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1000 commits 30 branches 42 tags 32 MiB
Commit graph

1000 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Wagner-Hall cfdcf9e5a3 Merge pull request #148 from matrix-org/daniel/leadingspacesucks 
speculator: Send Content-Type: text/html header
 2015-11-06 11:46:41 +00:00
Daniel Wagner-Hall 937ff046d8 Force / to be HTML too 2015-11-05 19:21:16 +00:00
Daniel Wagner-Hall 559747e77a speculator: Sent Content-Type: text/html header 
Go is auto-detecting that this is XML (because for some reason we
generate XHTML), and serving it with a Content-Type header text/xml.

This causes the browser to render it as XHTML, which gives interesting
quirks like extra newlines.

This forces the browser to interpret it as HTML.

What we should probably do instead of stop generating XHTML and start
generating HTML. But in the mean time, this will fix the rendering
issues.
 2015-11-05 19:18:28 +00:00
Daniel Wagner-Hall 161441fa3a Update 3pid spec based on new implementation 2015-11-05 18:11:20 +00:00
Daniel Wagner-Hall 232b10b0f6 Merge branch 'master' of github.com:matrix-org/matrix-doc 2015-11-05 13:25:51 +00:00
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
 2015-11-05 11:06:31 +00:00
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
 2015-11-05 10:55:11 +00:00
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
 2015-11-04 16:03:22 +00:00
Mark Haines 3b7ad9a11f Merge pull request #146 from matrix-org/markjh/syntax_highlighting_message_examples 
Enable syntax highlighting for message type examples
 2015-11-04 16:02:34 +00:00
Mark Haines c719946370 Enable syntax highlighting for message type examples 2015-11-04 11:51:50 +00:00
Mark Haines 8070489080 Handle lists of types in arrays 2015-11-04 11:44:20 +00:00
Mark Haines e49ea9015f Deduplicate tables with the same title 2015-11-04 11:39:36 +00:00
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 2015-11-03 19:42:49 +00:00
Mark Haines ebc0237109 Add the missing titles to the schema 2015-11-03 19:35:44 +00:00
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.
 2015-11-02 15:53:37 +00:00
Daniel Wagner-Hall 2e3a0b4e00 Specify guest accounts 2015-11-02 15:26:06 +00:00
Mark Haines 91eb25b76d Include the full schema for an http API in the docs by resolving references to other files 2015-10-30 15:45:46 +00:00
Mark Haines d297d83151 Mention that sender is renamed to user_id in v1 2015-10-29 18:45:53 +00:00
Mark Haines 451801bf38 Add an example of `prev_content in unsigned` to v2 /sync 2015-10-29 18:40:05 +00:00
Mark Haines d067e50af5 Document the differences in event formatting between the v1 and v2 client APIs 2015-10-29 18:38:33 +00:00
Matthew Hodgson 6c1df04b4b typo 2015-10-29 02:11:47 +00:00
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
 2015-10-28 18:54:26 +00:00
Mark Haines a11638cc95 Merge pull request #135 from matrix-org/markjh/request_syntax_highlighting 
Enable syntax highlighting for example http requests
 2015-10-28 16:42:06 +00:00
Paul "LeoNerd" Evans 745e607577 Use 'room' or 'room ID' instead of 'context' when describing federation protocol 2015-10-28 14:49:50 +00:00
Richard van der Hoff 3dd212e53b Merge pull request #133 from matrix-org/rav/full_state 
Proposal for adding full_state param to v2 sync
 2015-10-28 14:03:58 +00:00
Richard van der Hoff ece42688d0 Clarify the interaction between full_state and timeout. 2015-10-26 19:20:58 +00:00
Mark Haines 71874870c8 Enable syntax highlighting for example http requests 2015-10-26 17:25:33 +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
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