Commit Graph

6549 Commits (db0fd307447edeb5724c9897e07e6c56d87123f6)
 

Author SHA1 Message Date
Daniel Wagner-Hall cfdcf9e5a3 Merge pull request #148 from matrix-org/daniel/leadingspacesucks
speculator: Send Content-Type: text/html header
9 years ago
Daniel Wagner-Hall 937ff046d8 Force / to be HTML too 9 years ago
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.
9 years ago
Daniel Wagner-Hall 2734f9f9f2 Merge branch 'master' into daniel/multipleexamples
Conflicts:
	specification/modules/third_party_invites.rst
9 years ago
Daniel Wagner-Hall 161441fa3a Update 3pid spec based on new implementation 9 years ago
Daniel Wagner-Hall 232b10b0f6 Merge branch 'master' of github.com:matrix-org/matrix-doc 9 years ago
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
9 years ago
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
9 years ago
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
9 years ago
Mark Haines 3b7ad9a11f Merge pull request #146 from matrix-org/markjh/syntax_highlighting_message_examples
Enable syntax highlighting for message type examples
9 years ago
Mark Haines c719946370 Enable syntax highlighting for message type examples 9 years ago
Mark Haines 8070489080 Handle lists of types in arrays 9 years ago
Mark Haines e49ea9015f Deduplicate tables with the same title 9 years ago
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 9 years ago
Mark Haines ebc0237109 Add the missing titles to the schema 9 years ago
Paul "LeoNerd" Evans 30a4f17420 Don't mark 'aliases' on m.room.canonical_alias as required, because it isn't. 9 years ago
Paul "LeoNerd" Evans 9f286841da Merge branch 'master' into paul/small-fixes 9 years ago
Mark Haines d53814097f Add example content to the tags in example tag events 9 years ago
Mark Haines 3953006792 Fix spelling 9 years ago
Mark Haines fba3c04e42 Apparently the spec generator breaks if the title in a schema is too long 9 years ago
Mark Haines bcb8fac53c Add a description for the tag event 9 years ago
Mark Haines e9d361841b Fix tag examples 9 years ago
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.
9 years ago
Daniel Wagner-Hall 2e3a0b4e00 Specify guest accounts 9 years ago
Paul "LeoNerd" Evans f6c55979e0 Remove TODO comment about SYN-490 as it's unlikely to matter for v1; we'll fix it in v2 9 years ago
Paul "LeoNerd" Evans 40fa339cf7 Draw a pretty (well at least I think it's pretty) ASCII diagram of the remote join handshake 9 years ago
Mark Haines 149890227a Fix wording 9 years ago
Mark Haines 52f55e0542 Allow room tags to have asssociated content, and return that content in the m.tag events 9 years ago
Mark Haines 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 9 years ago
Mark Haines ad86426e95 Add private_user_data to v1 room /initialSync 9 years ago
Mark Haines b49472e3b0 Add private_user_data to v1 /initialSync 9 years ago
Daniel Wagner-Hall 9f4d81308d Pull out separate invite_room_state example 9 years ago
Daniel Wagner-Hall b8d412356e Merge branch 'daniel/3pidinvites' into daniel/multipleexamples 9 years ago
Mark Haines 91eb25b76d Include the full schema for an http API in the docs by resolving references to other files 9 years ago
Mark Haines d297d83151 Mention that sender is renamed to user_id in v1 9 years ago
Mark Haines 451801bf38 Add an example of ``prev_content`` in ``unsigned`` to v2 /sync 9 years ago
Mark Haines d067e50af5 Document the differences in event formatting between the v1 and v2 client APIs 9 years ago
Daniel Wagner-Hall cddfc110ed Review comments 9 years ago
Erik Johnston fa2fe2ddd9 Add event context api swagger 9 years ago
Matthew Hodgson 6c1df04b4b typo 9 years ago
Paul "LeoNerd" Evans 5b6f858802 Some initial notes by way of the remote join handshake; with several TODOs and unanswered questions 9 years ago
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
9 years ago
Mark Haines a11638cc95 Merge pull request #135 from matrix-org/markjh/request_syntax_highlighting
Enable syntax highlighting for example http requests
9 years ago
Daniel Wagner-Hall 810922bb38 Fix schema validator for multiple examples 9 years ago
Daniel Wagner-Hall 176f919fc8 Show multiple examples where present 9 years ago
Paul "LeoNerd" Evans 745e607577 Use 'room' or 'room ID' instead of 'context' when describing federation protocol 9 years ago
Daniel Wagner-Hall b92a0f2b4d Remove extra trailing comma 9 years ago
Daniel Wagner-Hall 81a60a25cc Update 3pid spec based on new implementation 9 years ago
Richard van der Hoff 3dd212e53b Merge pull request #133 from matrix-org/rav/full_state
Proposal for adding full_state param to v2 sync
9 years ago
Richard van der Hoff ece42688d0 Clarify the interaction between full_state and timeout. 9 years ago