Commit Graph

1043 Commits (299af673da3d4a698dc943aaabe3c2e961f2da49)
 

Author SHA1 Message Date
Mark Haines 299af673da Specify how ordering of tags is supposed to work 9 years ago
Mark Haines 3b390bff3c Merge branch 'master' into markjh/room_tags
Conflicts:
	api/client-server/v1/rooms.yaml
	specification/targets.yaml
9 years ago
Daniel Wagner-Hall 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
Daniel Wagner-Hall 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
Daniel Wagner-Hall 29d9c8eec6 Guests are allowed to set displaynames 9 years ago
Daniel Wagner-Hall 061105c9dc Guest users are allowed room initialSync 9 years ago
Daniel Wagner-Hall 703b9d456b Merge pull request #157 from matrix-org/daniel/specfetch
speculator: Nessle up some more if statements
9 years ago
Daniel Wagner-Hall 0f0359d9c1 speculator: Nessle up some more if statements 9 years ago
Daniel Wagner-Hall 567ba6d22d Merge pull request #156 from matrix-org/daniel/specfetch
speculator: Fetch before deciding head is fresh
9 years ago
Daniel Wagner-Hall 740cc66a7c speculator: Fetch before deciding head is fresh 9 years ago
Daniel Wagner-Hall 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
Daniel Wagner-Hall dcf54e11b1 Specify /publicRooms world_readable and guest_access
Depends on https://github.com/matrix-org/matrix-doc/pull/154
9 years ago
Daniel Wagner-Hall b6a4dfa7cd Merge pull request #154 from matrix-org/daniel/publicwritable
Specify /publicRooms
9 years ago
Daniel Wagner-Hall d7357ef9b7 Specify /publicRooms 9 years ago
Daniel Wagner-Hall 27ffe7bacd Don't serve rst diffs as HTML 9 years ago
Daniel Wagner-Hall 624756fb9a Merge pull request #153 from matrix-org/daniel/3pidyetagain
3pid invites: remove mentions of display_name
9 years ago
Daniel Wagner-Hall bdf755632e Merge pull request #152 from matrix-org/daniel/macaroons
Document macaroon type=login
9 years ago
Kegsay c8f6ed1107 More formatting.. 9 years ago
Kegsay 51fe4a90b6 More formatting fixes 9 years ago
Kegsay c1866ebebc Fix table formatting 9 years ago
Daniel Wagner-Hall 24c2036a35 3pid invites: remove mentions of display_name 9 years ago
Daniel Wagner-Hall 68bec3a61a Merge pull request #151 from matrix-org/daniel/continuservconcurrency
continuserv: guard concurrent accesses to wg
9 years ago
Daniel Wagner-Hall c3608b3a69 Merge branch 'master' into daniel/continuservconcurrency
Conflicts:
	scripts/continuserv/main.go
9 years ago
Daniel Wagner-Hall 436a35e9f6 Document macaroon type=login 9 years ago
Daniel Wagner-Hall e72151f2c3 Specify guest room access
This was reviewed as PR #150 and merged from daniel/anonymousaccess
9 years ago
Daniel Wagner-Hall 16b91086b0 Merge pull request #149 from matrix-org/daniel/continuservcontenttype
continuserv: set Content-Type header
9 years ago
Daniel Wagner-Hall bbf9e229a7 continuserv: guard concurrent accesses to wg 9 years ago
Daniel Wagner-Hall 1be5b856bd Preserve text/plain for errors
Newlines are nice
9 years ago
Daniel Wagner-Hall 7f6eafdce5 continuserv: set Content-Type header 9 years ago
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 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
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