1104 Commits (c539b208f9e4a397f350f856297ba0e00c562f9f)

 

All Branches   

Search

Author	SHA1	Message	Date
Mark Haines	c539b208f9	Merge branch 'markjh/room_tags' into markjh/client_config ... Conflicts: api/client-server/v2_alpha/sync.yaml	9 years ago
Mark Haines	d39494b6df	Fix typo in sync example	9 years ago
Mark Haines	5ccc39b850	Say that type is an event type	9 years ago
Mark Haines	e76068a2a6	Merge branch 'markjh/room_tags' into markjh/client_config	9 years ago
Mark Haines	5bae15d47b	Merge branch 'master' into markjh/room_tags ... Conflicts: api/client-server/v2_alpha/sync.yaml	9 years ago
Richard van der Hoff	181d3f976d	Initial proposal for websockets support.	9 years ago
Richard van der Hoff	d8dd380dfa	Merge pull request #164 from matrix-org/rav/SPEC-254 ... Fix /sync documentation, post SPEC-254	9 years ago
Richard van der Hoff	e7610c7cc5	Merge pull request #165 from matrix-org/rav/flatten_sync ... /sync response format tweaks	9 years ago
Mark Haines	032ee75537	Update specification wording to match s/config/account_data/	9 years ago
Mark Haines	05c0092664	s/config/account_data/	9 years ago
Daniel Wagner-Hall	1a1a7d87dc	Revert "Changelog for 0.3.0" ... This reverts commit 5aeaa42a50.	9 years ago
Daniel Wagner-Hall	5aeaa42a50	Changelog for 0.3.0	9 years ago
Paul Evans	e95a1616af	Merge pull request #143 from matrix-org/paul/federation-room-join ... Document the federation remote join handshake	9 years ago
Richard van der Hoff	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
Daniel Wagner-Hall	7b1e8359d9	Merge pull request #173 from matrix-org/daniel/forgetrooms ... Specify /rooms/:room_id/forget	9 years ago
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
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.	9 years ago
Daniel Wagner-Hall	6763317e64	Specify /rooms/:room_id/forget	9 years ago
Daniel Wagner-Hall	a0fb7af8fc	Merge pull request #172 from matrix-org/daniel/specleaving ... Swaggerify /rooms/:room_id/leave	9 years ago
Daniel Wagner-Hall	8201eaa042	Swaggerify /rooms/:room_id/leave	9 years ago
Kegsay	994c0974f9	Merge pull request #162 from matrix-org/rav/refactor_tables ... Rewrite the table templates	9 years ago
Kegan Dougal	d1c685f296	Merge branch 'master' into rav/refactor_tables	9 years ago
Mark Haines	03a0377c76	Plans for end-to-end in matrix	9 years ago
Daniel Wagner-Hall	5db56df851	Merge pull request #160 from matrix-org/daniel/optional ... Note that invite_room_state is optional	9 years ago
Mark Haines	c77b22778f	Add some documentation on names of tags	9 years ago
Mark Haines	25769493b1	Fix template	9 years ago
Mark Haines	e7fbe6f13b	Limit the size of a tag	9 years ago
Mark Haines	48f35e15cb	describe how to order rooms that don't have an order in their tags	9 years ago
Mark Haines	299af673da	Specify how ordering of tags is supposed to work	9 years ago
Richard van der Hoff	7ff593b3de	Merge branch 'rav/SPEC-254' into rav/flatten_sync ... Conflicts: specification/events.rst	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
Richard van der Hoff	0db055b4ea	Fix another reference to 'txn_id'	9 years ago
Richard van der Hoff	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
Mark Haines	8f5783615c	Merge branch 'master' into markjh/client_config ... Conflicts: api/client-server/v1/rooms.yaml specification/targets.yaml	9 years ago
Paul "LeoNerd" Evans	233e8486bc	Wording fix - objects contain keys, not list elements directly	9 years ago
Richard van der Hoff	8316881393	txn_id field in events is called transaction_id	9 years ago
Mark Haines	c3769ef75c	Add a module for client config to the specification	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
Paul "LeoNerd" Evans	6cbfba7011	'auth_events' is a List, not a String	9 years ago
Paul "LeoNerd" Evans	122c082fcf	Comment about origin servers of invites having subsequently left the room	9 years ago
Kegsay	2b19b50f4f	Merge pull request #167 from matrix-org/more_nesting ... Support more nesting	9 years ago
Paul "LeoNerd" Evans	923f05e554	More consistency around 'resident homeserver'	9 years ago
Paul "LeoNerd" Evans	36af793f05	s/full object/full event/	9 years ago
Kegan Dougal	8648f86032	Moar spaces	9 years ago
Erik Johnston	96be7ff241	Support more nesting	9 years ago
Richard van der Hoff	e1b12a753e	Fix typos and missing file	9 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	9 years ago