Commit Graph

134 Commits (e072d215cf466e76552a6eb53dc9e1cea8a4838c)

Author SHA1 Message Date
Matthew Hodgson b946d39886 typo 10 years ago
Daniel Wagner-Hall f6229f649a Remove confusing wording 10 years ago
Daniel Wagner-Hall 6c66bfc755 Flatten out v1 and v2_alpha directories
As a side effect, I got rid of all of the horrible symlinks and just put
in all of the proper relative paths. Because the horrible symlinks were
horrible.
10 years ago
Daniel Wagner-Hall e401d3e262 Merge pull request #184 from matrix-org/daniel/splitspec
Split spec into page-per-section
10 years ago
Daniel Wagner-Hall e171acf01f Split spec into page-per-section 10 years ago
Mark Haines a20a49abf6 Merge pull request #168 from matrix-org/markjh/client_config
Add API for setting client config
10 years ago
Mark Haines c5f457cee9 Merge pull request #132 from matrix-org/markjh/room_tags
Document a v2 api for setting tags on rooms
10 years ago
Richard van der Hoff 0b1ba70a32 fix rst markup
`` > `
10 years ago
Richard van der Hoff 2dbb8ba56c Fix title levels
make the title decoration consistent with the rest of the spec
10 years ago
Richard van der Hoff 51ca25a472 Merge branch 'master' into markjh/end_to_end_encryption 10 years ago
Richard van der Hoff 5f4458b2ff Merge branch 'master' into markjh/end_to_end_encryption 10 years ago
Daniel Wagner-Hall 5e30b5b8d7 Remove POST version of /send
PUT should always be used.
10 years ago
Mark Haines 032ee75537 Update specification wording to match s/config/account_data/ 10 years ago
Mark Haines 05c0092664 s/config/account_data/ 10 years ago
Mark Haines 40f7eab73f s/private_user_data/account_data/ 10 years ago
Mark Haines 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
10 years ago
Mark Haines fcbb985073 s/private_user_data/account_data/ 10 years ago
Mark Haines c77b22778f Add some documentation on names of tags 10 years ago
Mark Haines 25769493b1 Fix template 10 years ago
Mark Haines e7fbe6f13b Limit the size of a tag 10 years ago
Mark Haines 48f35e15cb describe how to order rooms that don't have an order in their tags 10 years ago
Mark Haines 299af673da Specify how ordering of tags is supposed to work 10 years ago
Mark Haines 3b390bff3c Merge branch 'master' into markjh/room_tags
Conflicts:
	api/client-server/v1/rooms.yaml
	specification/targets.yaml
10 years ago
Mark Haines 8f5783615c Merge branch 'master' into markjh/client_config
Conflicts:
	api/client-server/v1/rooms.yaml
	specification/targets.yaml
10 years ago
Mark Haines c3769ef75c Add a module for client config to the specification 10 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
10 years ago
Daniel Wagner-Hall 29d9c8eec6 Guests are allowed to set displaynames 10 years ago
Daniel Wagner-Hall 061105c9dc Guest users are allowed room initialSync 10 years ago
Daniel Wagner-Hall 24c2036a35 3pid invites: remove mentions of display_name 10 years ago
Daniel Wagner-Hall e72151f2c3 Specify guest room access
This was reviewed as PR #150 and merged from daniel/anonymousaccess
10 years ago
Daniel Wagner-Hall 161441fa3a Update 3pid spec based on new implementation 10 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
10 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
10 years ago
Mark Haines 3953006792 Fix spelling 10 years ago
Mark Haines 149890227a Fix wording 10 years ago
Mark Haines 52f55e0542 Allow room tags to have asssociated content, and return that content in the m.tag events 10 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 10 years ago
Mark Haines 65066a76b3 Add the m.tags event to a ``private_user_data`` key rather than including it under the ``ephemeral`` key 10 years ago
Mark Haines 9b0d20315a Add the tags module to the specification targets 10 years ago
Mark Haines 12e33a3b09 Document a v2 api for setting tags on rooms 10 years ago
Daniel Wagner-Hall 7c250f91ff Merge pull request #127 from matrix-org/daniel/exposedrooms
Allow history to be noted as world-readable
10 years ago
Kegsay 4823a133cd Merge pull request #124 from matrix-org/clarify_scale_crop
Clarify 'scale' & 'crop' resize methods
10 years ago
Daniel Wagner-Hall 67880686d5 Allow history to be noted as world-readable
SPEC-237
10 years ago
David Baker 01064369a4 Add some clarification on the difference between 'scale' and 'crop' resize methods 10 years ago
Mark Haines e3e8026025 Fix list formatting so that we aren't including everything in blockquotes 10 years ago
Erik Johnston f0c74a9c83 Merge pull request #96 from matrix-org/erikj/search_actual
Add search API
10 years ago
Erik Johnston 4a558ad63b Typo 10 years ago
Daniel Wagner-Hall a9a9067d7e Merge pull request #114 from matrix-org/daniel/3pidtosigned
Update 3pid invite section to reflect signed property
10 years ago
Erik Johnston 1d01f69c3c Merge remote-tracking branch 'origin/master' into erikj/search_actual 10 years ago
Erik Johnston 111ca99519 Clarify that this doesn't include events that occurred after you left the room. 10 years ago