bbf9e229a7
continuserv: guard concurrent accesses to wg
9 years ago
1be5b856bd
Preserve text/plain for errors
...
Newlines are nice
9 years ago
7f6eafdce5
continuserv: set Content-Type header
9 years ago
d5f96af1f1
Merge branch 'master' into daniel/multipleexamples
9 years ago
cfdcf9e5a3
Merge pull request #148 from matrix-org/daniel/leadingspacesucks
...
speculator: Send Content-Type: text/html header
9 years ago
937ff046d8
Force / to be HTML too
9 years ago
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
2734f9f9f2
Merge branch 'master' into daniel/multipleexamples
...
Conflicts:
specification/modules/third_party_invites.rst
9 years ago
161441fa3a
Update 3pid spec based on new implementation
9 years ago
232b10b0f6
Merge branch 'master' of github.com:matrix-org/matrix-doc
9 years ago
8cba11b1cd
Add some links to spec bugs for display names
...
Just added a couple of TODO comments to useful jira bugs
9 years ago
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
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
3b7ad9a11f
Merge pull request #146 from matrix-org/markjh/syntax_highlighting_message_examples
...
Enable syntax highlighting for message type examples
9 years ago
c719946370
Enable syntax highlighting for message type examples
9 years ago
8070489080
Handle lists of types in arrays
9 years ago
e49ea9015f
Deduplicate tables with the same title
9 years ago
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
ebc0237109
Add the missing titles to the schema
9 years ago
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
2e3a0b4e00
Specify guest accounts
9 years ago
f6c55979e0
Remove TODO comment about SYN-490 as it's unlikely to matter for v1; we'll fix it in v2
9 years ago
40fa339cf7
Draw a pretty (well at least I think it's pretty) ASCII diagram of the remote join handshake
9 years ago
9f4d81308d
Pull out separate invite_room_state example
9 years ago
b8d412356e
Merge branch 'daniel/3pidinvites' into daniel/multipleexamples
9 years ago
91eb25b76d
Include the full schema for an http API in the docs by resolving references to other files
9 years ago
d297d83151
Mention that sender is renamed to user_id in v1
9 years ago
451801bf38
Add an example of ``prev_content`` in ``unsigned`` to v2 /sync
9 years ago
d067e50af5
Document the differences in event formatting between the v1 and v2 client APIs
9 years ago
cddfc110ed
Review comments
9 years ago
6c1df04b4b
typo
9 years ago
5b6f858802
Some initial notes by way of the remote join handshake; with several TODOs and unanswered questions
9 years ago
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
a11638cc95
Merge pull request #135 from matrix-org/markjh/request_syntax_highlighting
...
Enable syntax highlighting for example http requests
9 years ago
810922bb38
Fix schema validator for multiple examples
9 years ago
176f919fc8
Show multiple examples where present
9 years ago
745e607577
Use 'room' or 'room ID' instead of 'context' when describing federation protocol
9 years ago
b92a0f2b4d
Remove extra trailing comma
9 years ago
81a60a25cc
Update 3pid spec based on new implementation
9 years ago
3dd212e53b
Merge pull request #133 from matrix-org/rav/full_state
...
Proposal for adding full_state param to v2 sync
9 years ago
ece42688d0
Clarify the interaction between full_state and timeout.
9 years ago
71874870c8
Enable syntax highlighting for example http requests
9 years ago
f3fd6e92fc
Merge pull request #134 from matrix-org/markjh/event_syntax_highlighting
...
Enable syntax highlighting for the JSON event examples
9 years ago
3f1cbb22bb
Enable syntax highlighting for the JSON event examples
9 years ago
13eddd456f
Proposal for adding full_state param to v2 sync
9 years ago
696f75d80b
Rename section
9 years ago
e2376e9a43
Merge branch 'erikj/login_fallback_v1' of github.com:matrix-org/matrix-doc
9 years ago
3cf431cac1
Add link
9 years ago
a22f1cd230
Merge pull request #119 from matrix-org/paul/test-vectors
...
Capture cryptographic test vectors for JSON or event signing from source
9 years ago
532634aff6
Merge pull request #130 from matrix-org/templating-nested-request-objects
...
Make nested request objects display correctly (search API)
9 years ago
Daniel Wagner-Hall