40f7eab73f
s/private_user_data/account_data/
9 years ago
24c4b8b095
Merge branch 'markjh/room_tags' into markjh/client_config
...
Conflicts:
api/client-server/v1/rooms.yaml
api/client-server/v1/sync.yaml
api/client-server/v2_alpha/sync.yaml
specification/targets.yaml
9 years ago
fcbb985073
s/private_user_data/account_data/
9 years ago
c77b22778f
Add some documentation on names of tags
9 years ago
25769493b1
Fix template
9 years ago
e7fbe6f13b
Limit the size of a tag
9 years ago
48f35e15cb
describe how to order rooms that don't have an order in their tags
9 years ago
299af673da
Specify how ordering of tags is supposed to work
9 years ago
3b390bff3c
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
9 years ago
8f5783615c
Merge branch 'master' into markjh/client_config
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
9 years ago
c3769ef75c
Add a module for client config to the specification
9 years ago
22b3159a39
Add examples of v1 initialSync and v2 /sync returning the client config
9 years ago
769c5285ab
Add API for setting client config
9 years ago
ea364a108b
Merge pull request #161 from matrix-org/daniel/guestdisplaynames
...
Merge pull request #161 from matrix-org/daniel/guestdisplaynames
Guests are allowed to set displaynames
9 years ago
c5e4d08e3b
Merge pull request #158 from matrix-org/daniel/guestroominitialsync
...
Merge pull request #158 from matrix-org/daniel/guestroominitialsync
Guest users are allowed room initialSync
9 years ago
29d9c8eec6
Guests are allowed to set displaynames
9 years ago
061105c9dc
Guest users are allowed room initialSync
9 years ago
703b9d456b
Merge pull request #157 from matrix-org/daniel/specfetch
...
speculator: Nessle up some more if statements
9 years ago
0f0359d9c1
speculator: Nessle up some more if statements
9 years ago
567ba6d22d
Merge pull request #156 from matrix-org/daniel/specfetch
...
speculator: Fetch before deciding head is fresh
9 years ago
740cc66a7c
speculator: Fetch before deciding head is fresh
9 years ago
a80fcfa83b
Merge pull request #155 from matrix-org/daniel/publicwritable2
...
Specify /publicRooms world_readable and guest_access
Depends on https://github.com/matrix-org/matrix-doc/pull/154
9 years ago
dcf54e11b1
Specify /publicRooms world_readable and guest_access
...
Depends on https://github.com/matrix-org/matrix-doc/pull/154
9 years ago
b6a4dfa7cd
Merge pull request #154 from matrix-org/daniel/publicwritable
...
Specify /publicRooms
9 years ago
d7357ef9b7
Specify /publicRooms
9 years ago
27ffe7bacd
Don't serve rst diffs as HTML
9 years ago
624756fb9a
Merge pull request #153 from matrix-org/daniel/3pidyetagain
...
3pid invites: remove mentions of display_name
9 years ago
bdf755632e
Merge pull request #152 from matrix-org/daniel/macaroons
...
Document macaroon type=login
9 years ago
c8f6ed1107
More formatting..
9 years ago
51fe4a90b6
More formatting fixes
9 years ago
c1866ebebc
Fix table formatting
9 years ago
24c2036a35
3pid invites: remove mentions of display_name
9 years ago
68bec3a61a
Merge pull request #151 from matrix-org/daniel/continuservconcurrency
...
continuserv: guard concurrent accesses to wg
9 years ago
c3608b3a69
Merge branch 'master' into daniel/continuservconcurrency
...
Conflicts:
scripts/continuserv/main.go
9 years ago
436a35e9f6
Document macaroon type=login
9 years ago
e72151f2c3
Specify guest room access
...
This was reviewed as PR #150 and merged from daniel/anonymousaccess
9 years ago
16b91086b0
Merge pull request #149 from matrix-org/daniel/continuservcontenttype
...
continuserv: set Content-Type header
9 years ago
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
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
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
Mark Haines