Mark Haines
|
40f7eab73f
|
s/private_user_data/account_data/
|
9 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
|
9 years ago |
|
Mark Haines
|
fcbb985073
|
s/private_user_data/account_data/
|
9 years ago |
|
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 |
|
Mark Haines
|
8f5783615c
|
Merge branch 'master' into markjh/client_config
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
|
9 years ago |
|
Mark Haines
|
22b3159a39
|
Add examples of v1 initialSync and v2 /sync returning the client config
|
9 years ago |
|
Mark Haines
|
769c5285ab
|
Add API for setting client config
|
9 years ago |
|
Daniel Wagner-Hall
|
061105c9dc
|
Guest users are allowed room initialSync
|
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
|
d7357ef9b7
|
Specify /publicRooms
|
9 years ago |
|
Daniel Wagner-Hall
|
24c2036a35
|
3pid invites: remove mentions of display_name
|
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
|
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 |
|
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
|
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
|
e9d361841b
|
Fix tag examples
|
9 years ago |
|
Daniel Wagner-Hall
|
2e3a0b4e00
|
Specify guest accounts
|
9 years ago |
|
Mark Haines
|
52f55e0542
|
Allow room tags to have asssociated content, and return that content in the m.tag events
|
9 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
|
9 years ago |
|
Mark Haines
|
ad86426e95
|
Add private_user_data to v1 room /initialSync
|
9 years ago |
|
Mark Haines
|
b49472e3b0
|
Add private_user_data to v1 /initialSync
|
9 years ago |
|
Mark Haines
|
451801bf38
|
Add an example of ``prev_content`` in ``unsigned`` to v2 /sync
|
9 years ago |
|
Matthew Hodgson
|
6c1df04b4b
|
typo
|
9 years ago |
|
Richard van der Hoff
|
ece42688d0
|
Clarify the interaction between full_state and timeout.
|
9 years ago |
|
Mark Haines
|
65066a76b3
|
Add the m.tags event to a ``private_user_data`` key rather than including it under the ``ephemeral`` key
|
9 years ago |
|
Mark Haines
|
12e33a3b09
|
Document a v2 api for setting tags on rooms
|
9 years ago |
|
Richard van der Hoff
|
13eddd456f
|
Proposal for adding full_state param to v2 sync
|
9 years ago |
|
Kegsay
|
ade0ad5ed1
|
Merge pull request #129 from matrix-org/erikj/search_actual
Add filter param to search API
|
9 years ago |
|
Erik Johnston
|
36634df355
|
Add filter param
|
9 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
|
9 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
|
9 years ago |
|
Mark Haines
|
1d7cb6937f
|
Merge pull request #123 from matrix-org/markjh/list_formatting
Fix list formatting
|
9 years ago |
|
Mark Haines
|
637718108e
|
Add newline before list
|
9 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.
|
9 years ago |
|
Richard van der Hoff
|
587a8ba7ce
|
Merge branch 'master' into rav/send_events_api
|
9 years ago |
|
Richard van der Hoff
|
d2bbc461e4
|
mark stateKey as required in room/{id}/state
Swagger insists that path params be mandatory.
|
9 years ago |
|
Richard van der Hoff
|
d18d406c41
|
Add the room send and state APIs to the spec
|
9 years ago |
|
Mark Haines
|
cc14620932
|
Add a newline before the list
|
9 years ago |
|
Mark Haines
|
e3e8026025
|
Fix list formatting so that we aren't including everything in blockquotes
|
9 years ago |
|
Erik Johnston
|
f0c74a9c83
|
Merge pull request #96 from matrix-org/erikj/search_actual
Add search API
|
9 years ago |
|
Kegan Dougal
|
f95d19cecd
|
Merge branch 'master' into appservice-swagger
Conflicts:
specification/application_service_api.rst
|
9 years ago |
|
Kegan Dougal
|
4c3e1b9ed3
|
Find replace fail
|
9 years ago |
|
Kegan Dougal
|
bd539c72b4
|
More review comments
|
9 years ago |
|
Erik Johnston
|
1d01f69c3c
|
Merge remote-tracking branch 'origin/master' into erikj/search_actual
|
9 years ago |
|
Kegan Dougal
|
26f27d95fb
|
Merge branch 'master' into registration-swagger
Conflicts:
specification/client_server_api.rst
|
9 years ago |
|
Kegan Dougal
|
f450fc1db6
|
Typo
|
9 years ago |
|
Kegan Dougal
|
4bb042daeb
|
Review comments round II
|
9 years ago |