835 Commits

Author	SHA1	Message	Date
Daniel Wagner-Hall	6ffbcf45c6	Use non-placeholder name for endpoint	2015-10-15 13:12:52 +01:00
Daniel Wagner-Hall	643b5fcdc8	Look for keys on the right objects	2015-10-15 13:10:30 +01:00
Daniel Wagner-Hall	f38df51e8d	Merge branch 'develop' into daniel/3pidinvites	2015-10-15 11:51:55 +01:00
Mark Haines	a059760954	Merge pull request #305 from matrix-org/markjh/v2_sync_api ... Update the v2 sync API to work as specified in the current spec.	2015-10-14 13:56:23 +01:00
Mark Haines	c185c1c413	Fix v2 sync polling	2015-10-14 13:16:53 +01:00
Erik Johnston	858634e1d0	Remove unused room_id arg	2015-10-14 09:31:20 +01:00
Daniel Wagner-Hall	0c38e8637f	Remove unnecessary class-wrapping	2015-10-13 18:00:38 +01:00
Daniel Wagner-Hall	14edea1aff	Move logic into handler	2015-10-13 17:47:58 +01:00
Daniel Wagner-Hall	bb407cd624	Re-add accidentally removed code	2015-10-13 17:19:26 +01:00
Daniel Wagner-Hall	17dffef5ec	Move event contents into third_party_layout field	2015-10-13 15:48:12 +01:00
Mark Haines	cacf0688c6	Add a get_invites_for_user method to the storage to find out the rooms a user is invited to	2015-10-13 14:08:38 +01:00
Daniel Wagner-Hall	32a453d7ba	Merge branch 'develop' into daniel/3pidinvites	2015-10-13 13:32:43 +01:00
Mark Haines	54414221e4	Include invites in incremental sync	2015-10-13 11:43:12 +01:00
Mark Haines	ab9cf73258	Include invited rooms in the initial sync	2015-10-13 11:03:48 +01:00
Mark Haines	f96b480670	Merge branch 'develop' into markjh/v2_sync_api	2015-10-13 10:33:00 +01:00
Mark Haines	956509dfec	Start spliting out the rooms into joined and invited in v2 sync	2015-10-13 10:24:51 +01:00
Mark Haines	586beb8318	Update the filters to match the latest spec. ... Apply the filter the 'timeline' and 'ephemeral' keys of rooms. Apply the filter to the 'presence' key of a sync response.	2015-10-12 16:54:58 +01:00
Mark Haines	54cb509d64	Merge pull request #296 from matrix-org/markjh/eventstream_presence ... Split the sections of EventStreamHandler.get_stream that handle presence	2015-10-12 14:48:09 +01:00
Mark Haines	885301486c	Merge pull request #297 from matrix-org/markjh/presence_races ... Fix some races in the synapse presence handler caused by not yielding…	2015-10-12 14:47:53 +01:00
Steven Hammerton	22112f8d14	Formatting changes	2015-10-10 10:49:42 +01:00
Steven Hammerton	c33f5c1a24	Provide ability to login using CAS	2015-10-10 10:49:42 +01:00
Mark Haines	1a46daf621	Merge branch 'markjh/presence_races' into markjh/v2_sync_api	2015-10-09 20:02:30 +01:00
Mark Haines	987803781e	Fix some races in the synapse presence handler caused by not yielding on deferreds	2015-10-09 19:59:50 +01:00
Mark Haines	af7b214476	Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api	2015-10-09 19:18:09 +01:00
Mark Haines	1b9802a0d9	Split the sections of EventStreamHandler.get_stream that handle presence ... into separate functions. This makes the code a bit easier to read, and means that we can reuse the logic when implementing the v2 sync API.	2015-10-09 19:13:08 +01:00
Mark Haines	dc72021748	Add a flag to initial sync to indicate we want rooms that the user has left	2015-10-08 17:26:23 +01:00
Mark Haines	dfef2b41aa	Update the v2 room sync format to match the current v2 spec	2015-10-08 15:17:43 +01:00
Daniel Wagner-Hall	61ee72517c	Remove merge thinko	2015-10-06 10:16:15 -05:00
Daniel Wagner-Hall	d4bb28c59b	Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation"" ... This reverts commit 34d26d3687.	2015-10-06 09:58:21 -05:00
Daniel Wagner-Hall	c05b5ef7b0	Merge branch 'develop' into daniel/3pidinvites	2015-10-06 08:10:34 -05:00
Daniel Wagner-Hall	34d26d3687	Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation" ... This reverts commit 5879edbb09, reversing changes made to b43930d4c9.	2015-10-05 19:10:47 -05:00
Mark Haines	471555b3a8	Move the rooms out into a room_map mapping from room_id to room.	2015-10-05 16:39:36 +01:00
Daniel Wagner-Hall	58e6a58eb7	Merge branch 'develop' into daniel/3pidinvites	2015-10-05 10:33:41 -05:00
Erik Johnston	49ebd472fa	Explicitly add Create event as auth event	2015-10-02 13:22:36 +01:00
Erik Johnston	40017a9a11	Add 'trusted_private_chat' to room creation presets	2015-10-02 11:22:56 +01:00
Erik Johnston	a086b7aa00	Merge pull request #275 from matrix-org/erikj/invite_state ... Bundle in some room state in invites.	2015-10-02 11:15:43 +01:00
Erik Johnston	9c311dfce5	Also bundle in sender	2015-10-02 11:04:23 +01:00
Erik Johnston	d5e081c7ae	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable	2015-10-02 10:33:49 +01:00
Erik Johnston	5879edbb09	Merge pull request #283 from matrix-org/erikj/atomic_join_federation ... Atomically persist events when joining a room over federation/	2015-10-02 09:18:44 +01:00
Mark Haines	f31014b18f	Start updating the sync API to match the specification	2015-10-01 17:53:07 +01:00
Daniel Wagner-Hall	5b3e9713dd	Implement third party identifier invites	2015-10-01 17:49:52 +01:00
Erik Johnston	0ec78b360c	Merge pull request #287 from matrix-org/erikj/canonical_alias ... Set m.room.canonical_alias on room creation.	2015-09-30 17:14:55 +01:00
Erik Johnston	ecd0c0dfc5	Remove double indentation	2015-09-30 16:46:24 +01:00
Erik Johnston	83892d0d30	Comment	2015-09-30 16:41:48 +01:00
Erik Johnston	9d39615b7d	Rename var	2015-09-30 16:37:59 +01:00
Mark Haines	301141515a	Merge pull request #288 from matrix-org/markjh/unused_definitions ... Remove some of the unused definitions from synapse	2015-09-28 14:22:44 +01:00
Erik Johnston	a14665bde7	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state	2015-09-25 11:38:28 +01:00
Mark Haines	57338a9768	synapse/handlers/room.py:_should_invite_join was unused	2015-09-23 10:26:45 +01:00
Mark Haines	60728c8c9e	synapse/handlers/federation.py:_handle_auth_events was unused	2015-09-23 10:25:26 +01:00
Erik Johnston	257fa1c53e	Set m.room.canonical_alias on room creation.	2015-09-23 10:07:31 +01:00