d39494b6df
Fix typo in sync example
9 years ago
5bae15d47b
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v2_alpha/sync.yaml
9 years ago
181d3f976d
Initial proposal for websockets support.
9 years ago
d8dd380dfa
Merge pull request #164 from matrix-org/rav/SPEC-254
...
Fix /sync documentation, post SPEC-254
9 years ago
e7610c7cc5
Merge pull request #165 from matrix-org/rav/flatten_sync
...
/sync response format tweaks
9 years ago
1a1a7d87dc
Revert "Changelog for 0.3.0"
...
This reverts commit 5aeaa42a50
9 years ago
5aeaa42a50
Changelog for 0.3.0
9 years ago
e95a1616af
Merge pull request #143 from matrix-org/paul/federation-room-join
...
Document the federation remote join handshake
9 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.
9 years ago
7b1e8359d9
Merge pull request #173 from matrix-org/daniel/forgetrooms
...
Specify /rooms/:room_id/forget
9 years ago
fcbb985073
s/private_user_data/account_data/
9 years ago
6653362f31
Unflatten 'unsigned'
...
It turns out that flattening 'unsigned' comes with too many downsides. Let's
stick with the status quo.
9 years ago
6763317e64
Specify /rooms/:room_id/forget
9 years ago
a0fb7af8fc
Merge pull request #172 from matrix-org/daniel/specleaving
...
Swaggerify /rooms/:room_id/leave
9 years ago
8201eaa042
Swaggerify /rooms/:room_id/leave
9 years ago
994c0974f9
Merge pull request #162 from matrix-org/rav/refactor_tables
...
Rewrite the table templates
9 years ago
d1c685f296
Merge branch 'master' into rav/refactor_tables
9 years ago
03a0377c76
Plans for end-to-end in matrix
9 years ago
5db56df851
Merge pull request #160 from matrix-org/daniel/optional
...
Note that invite_room_state is optional
9 years ago
c77b22778f
Add some documentation on names of tags
9 years ago
25769493b1
Fix template
9 years ago
e7fbe6f13b
Limit the size of a tag
9 years ago
48f35e15cb
describe how to order rooms that don't have an order in their tags
9 years ago
299af673da
Specify how ordering of tags is supposed to work
9 years ago
7ff593b3de
Merge branch 'rav/SPEC-254' into rav/flatten_sync
...
Conflicts:
specification/events.rst
9 years ago
3b390bff3c
Merge branch 'master' into markjh/room_tags
...
Conflicts:
api/client-server/v1/rooms.yaml
specification/targets.yaml
9 years ago
0db055b4ea
Fix another reference to 'txn_id'
9 years ago
58b7901b51
Merge branch 'rav/SPEC-254' into rav/flatten_sync
...
Conflicts:
api/client-server/v2_alpha/definitions/event.json
api/client-server/v2_alpha/sync.yaml
9 years ago
233e8486bc
Wording fix - objects contain keys, not list elements directly
9 years ago
8316881393
txn_id field in events is called transaction_id
9 years ago
6cbfba7011
'auth_events' is a List, not a String
9 years ago
122c082fcf
Comment about origin servers of invites having subsequently left the room
9 years ago
2b19b50f4f
Merge pull request #167 from matrix-org/more_nesting
...
Support more nesting
9 years ago
923f05e554
More consistency around 'resident homeserver'
9 years ago
36af793f05
s/full object/full event/
9 years ago
8648f86032
Moar spaces
9 years ago
96be7ff241
Support more nesting
9 years ago
e1b12a753e
Fix typos and missing file
9 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
9 years ago
b41d771c15
Fix typos in /sync example response
9 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.
9 years ago
3f0262081c
Update sync API defn to reflect SPEC-254 changes
...
State now corresponds to the start of the timeline, not the end.
9 years ago
cc8ef691fb
Rewrite the table templates
...
Allow columns to stretch if they end up with wide content.
Apart from the hassle of having to manually update the calculations, having the
columns wide enough to hold the widest thing they might ever have leads to
tables with lots of whitespace in the results.
9 years ago
988d773476
/make_join protoevent no longer needs the pointless 'prev_state' key (SYN-517)
9 years ago
885dd1e86c
Explain the 'prev_events' join protoevent key
9 years ago
db5a90edcd
Avoid using the words 'current state' when talking about the result of the /make_join request
9 years ago
aac45295ee
Remark that the directory server step could be skipped in an invite case
9 years ago
d7c69fae43
Fix typo 'process'
9 years ago
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
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
Mark Haines