Commit Graph

442 Commits (2ea66e93006aa971aa36a50ad751ba84339741d0)

Author SHA1 Message Date
Daniel Wagner-Hall c6e0322a9e Swaggerify /account 10 years ago
Daniel Wagner-Hall c9c433bc15 Make section depths consistent 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 b479b54cd8 Add tables of contents to individual specs 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
Daniel Wagner-Hall bc514dc9c4 Merge pull request #178 from matrix-org/daniel/directory
Fix and include /directory api docs
10 years ago
Daniel Wagner-Hall 7f2813354d Swaggerify /ban 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 d9130f0e13 Merge pull request #24 from matrix-org/markjh/end_to_end_encryption
Basic specification for key distribution for end-to-end cryptography.
10 years ago
Daniel Wagner-Hall ad4d8ae7a6 Move client-server intro to client-server section 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
Richard van der Hoff 8d41536757 Address kegan's comments
Minor fixes to the e2e spec as raiseds by kegan
10 years ago
Daniel Wagner-Hall 5e30b5b8d7 Remove POST version of /send
PUT should always be used.
10 years ago
Daniel Wagner-Hall c25a806cef Fix and include /directory api docs 10 years ago
Mark Haines e76068a2a6 Merge branch 'markjh/room_tags' into markjh/client_config 10 years ago
Mark Haines 5bae15d47b Merge branch 'master' into markjh/room_tags
Conflicts:
	api/client-server/v2_alpha/sync.yaml
10 years ago
Richard van der Hoff d8dd380dfa Merge pull request #164 from matrix-org/rav/SPEC-254
Fix /sync documentation, post SPEC-254
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
Paul Evans e95a1616af Merge pull request #143 from matrix-org/paul/federation-room-join
Document the federation remote join handshake
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
Richard van der Hoff 6653362f31 Unflatten 'unsigned'
It turns out that flattening 'unsigned' comes with too many downsides. Let's
stick with the status quo.
10 years ago
Daniel Wagner-Hall 8201eaa042 Swaggerify /rooms/:room_id/leave 10 years ago
Erik Johnston 373c6c8270 Add ordering, pagination and grouping comments 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
Richard van der Hoff 7ff593b3de Merge branch 'rav/SPEC-254' into rav/flatten_sync
Conflicts:
	specification/events.rst
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
Richard van der Hoff 0db055b4ea Fix another reference to 'txn_id' 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
Paul "LeoNerd" Evans 233e8486bc Wording fix - objects contain keys, not list elements directly 10 years ago
Mark Haines c3769ef75c Add a module for client config to the specification 10 years ago
Paul "LeoNerd" Evans 6cbfba7011 'auth_events' is a List, not a String 10 years ago
Paul "LeoNerd" Evans 122c082fcf Comment about origin servers of invites having subsequently left the room 10 years ago
Paul "LeoNerd" Evans 923f05e554 More consistency around 'resident homeserver' 10 years ago
Paul "LeoNerd" Evans 36af793f05 s/full object/full event/ 10 years ago
Richard van der Hoff 29bd4d45ee Flatten the response to /sync
Now that we don't expect there to be duplication betwen the 'timeline' and
'state' results, there's no point in having the state map. (That does mean the
events themselves need event_id fields though).

Also:

- move the contents of the 'unsigned' dictionary into the events themselves
- replace the state list with two layers of dictionary keyed on type and
  state_key
- rename the children of the 'rooms' dict from "joined/invited/archived" to
  "join/invite/leave" to match the membership states
10 years ago
Richard van der Hoff 57995a815a Fix a number of untruths in the documentation about /sync.
Attempts to make the /sync documentation better represent fact as it currently
stands - in particular document the structure of the returned events.
10 years ago
Paul "LeoNerd" Evans 988d773476 /make_join protoevent no longer needs the pointless 'prev_state' key (SYN-517) 10 years ago
Paul "LeoNerd" Evans 885dd1e86c Explain the 'prev_events' join protoevent key 10 years ago
Paul "LeoNerd" Evans db5a90edcd Avoid using the words 'current state' when talking about the result of the /make_join request 10 years ago
Paul "LeoNerd" Evans aac45295ee Remark that the directory server step could be skipped in an invite case 10 years ago
Paul "LeoNerd" Evans d7c69fae43 Fix typo 'process' 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 d7357ef9b7 Specify /publicRooms 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
Paul "LeoNerd" Evans f6c55979e0 Remove TODO comment about SYN-490 as it's unlikely to matter for v1; we'll fix it in v2 10 years ago
Paul "LeoNerd" Evans 40fa339cf7 Draw a pretty (well at least I think it's pretty) ASCII diagram of the remote join handshake 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 d297d83151 Mention that sender is renamed to user_id in v1 10 years ago
Mark Haines d067e50af5 Document the differences in event formatting between the v1 and v2 client APIs 10 years ago
Paul "LeoNerd" Evans 5b6f858802 Some initial notes by way of the remote join handshake; with several TODOs and unanswered questions 10 years ago
Paul "LeoNerd" Evans 745e607577 Use 'room' or 'room ID' instead of 'context' when describing federation protocol 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
Richard van der Hoff 13eddd456f Proposal for adding full_state param to v2 sync 10 years ago
Erik Johnston 696f75d80b Rename section 10 years ago
Erik Johnston e2376e9a43 Merge branch 'erikj/login_fallback_v1' of github.com:matrix-org/matrix-doc 10 years ago
Erik Johnston 3cf431cac1 Add link 10 years ago
Kegsay a22f1cd230 Merge pull request #119 from matrix-org/paul/test-vectors
Capture cryptographic test vectors for JSON or event signing from source
10 years ago
Erik Johnston 9a5bd6d21f Use static 10 years ago
Erik Johnston 98dbf4d60b Better flow 10 years ago
Erik Johnston 0529b4a9a2 Reword 10 years ago
Erik Johnston 88c459d549 Add back in login v1 fallback API 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
Richard van der Hoff f47a49de43 Merge pull request #126 from matrix-org/rav/send_events_api
Add the room send and state APIs to the spec
10 years ago
Richard van der Hoff 1945697456 Further tweaks to the room send and state APIs
- fix confusion re empty/absent state_keys
- move 'types of room events' section earlier in the 'Events' section
- remove some redundant anchors
10 years ago
Mark Haines 1d7cb6937f Merge pull request #123 from matrix-org/markjh/list_formatting
Fix list formatting
10 years ago
Richard van der Hoff 28ab643a4e Remove duplicated registration/login APIs
Currently the spec duplicates all of the account-management APIs. There's still
work to be done here, but the complete duplication is confusing.
10 years ago
Daniel Wagner-Hall 67880686d5 Allow history to be noted as world-readable
SPEC-237
10 years ago
Richard van der Hoff 587a8ba7ce Merge branch 'master' into rav/send_events_api 10 years ago
Richard van der Hoff d18d406c41 Add the room send and state APIs to the spec 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
Kegan Dougal f95d19cecd Merge branch 'master' into appservice-swagger
Conflicts:
	specification/application_service_api.rst
10 years ago
Daniel Wagner-Hall 74d42f0142 Allow rejecting invitations 10 years ago
Paul "LeoNerd" Evans e38e4788f2 Spell 'cryptographic' correctly 10 years ago