wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1120 commits 4 branches 0 tags 17 MiB
Commit graph

1120 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
2734f9f9f2 Merge branch 'master' into daniel/multipleexamples 
Conflicts:
	specification/modules/third_party_invites.rst
 2015-11-05 18:33:31 +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
Paul "LeoNerd" Evans
f6c55979e0 Remove TODO comment about SYN-490 as it's unlikely to matter for v1; we'll fix it in v2 2015-11-02 15:17:18 +00:00
Paul "LeoNerd" Evans
40fa339cf7 Draw a pretty (well at least I think it's pretty) ASCII diagram of the remote join handshake 2015-11-02 15:00:18 +00:00
Daniel Wagner-Hall
9f4d81308d Pull out separate invite_room_state example 2015-10-30 16:21:50 +00:00
Daniel Wagner-Hall
b8d412356e Merge branch 'daniel/3pidinvites' into daniel/multipleexamples 2015-10-30 16:20:46 +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
Daniel Wagner-Hall
cddfc110ed Review comments 2015-10-29 12:48:04 +00:00
Matthew Hodgson
6c1df04b4b typo 2015-10-29 02:11:47 +00:00
Paul "LeoNerd" Evans
5b6f858802 Some initial notes by way of the remote join handshake; with several TODOs and unanswered questions 2015-10-28 20:28:49 +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
Daniel Wagner-Hall
810922bb38 Fix schema validator for multiple examples 2015-10-28 15:06:44 +00:00
Daniel Wagner-Hall
176f919fc8 Show multiple examples where present 2015-10-28 15:00:53 +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
Daniel Wagner-Hall
b92a0f2b4d Remove extra trailing comma 2015-10-28 14:49:41 +00:00
Daniel Wagner-Hall
81a60a25cc Update 3pid spec based on new implementation 2015-10-28 14:46:10 +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