c539b208f9
Merge branch 'markjh/room_tags' into markjh/client_config
...
Conflicts:
api/client-server/v2_alpha/sync.yaml
10 years ago
d39494b6df
Fix typo in sync example
10 years ago
5ccc39b850
Say that type is an event type
10 years ago
e76068a2a6
Merge branch 'markjh/room_tags' into markjh/client_config
10 years ago
5bae15d47b
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v2_alpha/sync.yaml
10 years ago
05c0092664
s/config/account_data/
10 years ago
d7d59d78e1
/sync: Put state dict back to being a list
...
Turning the state into a dict-of-dicts caused more pain than it solved. Put it
back to a list.
10 years ago
40f7eab73f
s/private_user_data/account_data/
10 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
10 years ago
fcbb985073
s/private_user_data/account_data/
10 years ago
6653362f31
Unflatten 'unsigned'
...
It turns out that flattening 'unsigned' comes with too many downsides. Let's
stick with the status quo.
10 years ago
299af673da
Specify how ordering of tags is supposed to work
10 years ago
3b390bff3c
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
10 years ago
8f5783615c
Merge branch 'master' into markjh/client_config
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
10 years ago
22b3159a39
Add examples of v1 initialSync and v2 /sync returning the client config
10 years ago
769c5285ab
Add API for setting client config
10 years ago
e1b12a753e
Fix typos and missing file
10 years ago
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
b41d771c15
Fix typos in /sync example response
10 years ago
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
3f0262081c
Update sync API defn to reflect SPEC-254 changes
...
State now corresponds to the start of the timeline, not the end.
10 years ago
232b10b0f6
Merge branch 'master' of github.com:matrix-org/matrix-doc
10 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
10 years ago
ebc0237109
Add the missing titles to the schema
10 years ago
d53814097f
Add example content to the tags in example tag events
10 years ago
e9d361841b
Fix tag examples
10 years ago
2e3a0b4e00
Specify guest accounts
10 years ago
52f55e0542
Allow room tags to have asssociated content, and return that content in the m.tag events
10 years ago
451801bf38
Add an example of ``prev_content`` in ``unsigned`` to v2 /sync
10 years ago
6c1df04b4b
typo
10 years ago
ece42688d0
Clarify the interaction between full_state and timeout.
10 years ago
65066a76b3
Add the m.tags event to a ``private_user_data`` key rather than including it under the ``ephemeral`` key
10 years ago
12e33a3b09
Document a v2 api for setting tags on rooms
10 years ago
13eddd456f
Proposal for adding full_state param to v2 sync
10 years ago
1d7cb6937f
Merge pull request #123 from matrix-org/markjh/list_formatting
...
Fix list formatting
10 years ago
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
e3e8026025
Fix list formatting so that we aren't including everything in blockquotes
10 years ago
f450fc1db6
Typo
10 years ago
e0fe3c42c8
Review comments
10 years ago
eca98af896
Swaggerify /register endpoint
...
Need to move registration/login/auth sections around once #94 lands.
10 years ago
034241eb20
Missing symlink for the v2 swagger APIs
10 years ago
509d178d58
Fix the receipts API to be valid swagger
10 years ago
4f606cf3a7
Add the fields required by the templating system to v2 sync
10 years ago
5a5a6565ff
Merge pull request #68 from matrix-org/markjh/v2_sync_api
...
Swagger documentation for the v2 sync API
10 years ago
0ce533d153
Split the room_map into separate sections based on whether they are
...
"joined/invited/archived".
Rename the room_map to rooms and remove the grouping indirection. When we
want groups then we can add them under a separate key, either at the
top-level or as part of the events themselves.
10 years ago
0e5b00feaa
Fix event type in v2 sync example
10 years ago
bbb5fa9398
Fix the state_key in the example v2 response, include the "sender" key in the list of keys included with invite_state events
10 years ago
a7b808c5cd
Add a invite_state key for holding the state that is bundled with an
...
invite. This is kept separate from the actual state for the room as
it may be derived from an incomplete, unverified copy of the state
that was bundled with an invite event received over federation.
10 years ago
ed0f6d3ff3
Typo
10 years ago
97cdd8106c
s|client/api/v2_alpha|/client/v2_alpha|
10 years ago
Mark Haines