978 Commits (ce4999268a06ccc716d1340b0f4c3e88103d7084)

Author	SHA1	Message	Date
David Baker	ce4999268a	Fix typo that broke registration on the mobile clients	2015-12-18 10:07:28 +00:00
Daniel Wagner-Hall	0311612ce9	Give the IS a bunch more 3pid invite context ... This allows it to form richer emails	2015-12-16 13:05:32 +00:00
Mark Haines	4fab578b43	Merge branch 'release-v0.12.0' into develop	2015-12-16 11:18:45 +00:00
Mark Haines	dbe7892e03	Fix a race between started/stopped stream	2015-12-14 15:09:41 +00:00
Mark Haines	15e9885197	Merge branch 'release-v0.12.0' into develop	2015-12-14 14:46:55 +00:00
Mark Haines	deeebbfcb7	Merge branch 'release-v0.12.0' into develop	2015-12-12 14:21:49 +00:00
Mark Haines	1ee7280c4c	Do the /sync in parallel accross the rooms like /initialSync does	2015-12-11 16:48:20 +00:00
Erik Johnston	cde49d3d2b	Merge pull request #435 from matrix-org/erikj/search ... Include approximate count of search results	2015-12-11 16:27:38 +00:00
Erik Johnston	d9a5c56930	Include approximate count of search results	2015-12-11 11:40:23 +00:00
Mark Haines	7d6b313312	Add caches for whether a room has been forgotten by a user	2015-12-10 17:49:34 +00:00
Paul "LeoNerd" Evans	99afb4b750	Ensure that the event that gets persisted is the one that was signed	2015-12-10 17:08:21 +00:00
Erik Johnston	7c2ff8c889	Merge pull request #405 from matrix-org/erikj/search-ts ... Change the result dict to be a list in /search response	2015-12-08 16:15:27 +00:00
Mark Haines	660dee94af	Only include the archived rooms if a include_leave flag in set in the filter	2015-12-04 17:32:09 +00:00
Mark Haines	b29d2fd7f8	Merge pull request #419 from matrix-org/markjh/reuse_captcha_client ... Reuse the captcha client rather than creating a new one for each request	2015-12-03 17:00:59 +00:00
Daniel Wagner-Hall	edfcb83473	Flatten devices into a dict, not a list	2015-12-03 16:19:21 +00:00
Mark Haines	478b4e3ed4	Reuse the captcha client rather than creating a new one for each request	2015-12-03 13:48:55 +00:00
Daniel Wagner-Hall	e880164c59	Merge pull request #418 from matrix-org/daniel/whois ... Merge pull request #418 from matrix-org/daniel/whois	2015-12-03 12:18:01 +00:00
Daniel Wagner-Hall	526bc33e02	Fix implementation of /admin/whois	2015-12-02 17:29:47 +00:00
Mark Haines	491f3d16dc	Make state updates in the C+S API idempotent	2015-12-02 15:50:50 +00:00
Mark Haines	58d0927767	Merge pull request #410 from matrix-org/markjh/edu_frequency ... Only fire user_joined_room if the user has actually joined.	2015-12-02 13:17:15 +00:00
Mark Haines	c2c70f7daf	Use the context returned by _handle_new_event	2015-12-02 12:01:24 +00:00
Mark Haines	37b2d69bbc	Reuse a single http client, rather than creating new ones	2015-12-02 11:36:02 +00:00
Mark Haines	dede14f689	Merge branch 'develop' into markjh/edu_frequency	2015-12-02 10:57:51 +00:00
Mark Haines	5eb4d13aaa	Fix typo in collect_presencelike_data	2015-12-02 10:50:58 +00:00
Mark Haines	c30cdb0d68	Add comments	2015-12-02 10:49:35 +00:00
Mark Haines	2a0ec3b89d	Merge branch 'develop' into markjh/edu_frequency ... Conflicts: synapse/handlers/federation.py synapse/handlers/room.py	2015-12-02 10:40:22 +00:00
Mark Haines	9fbd504b4e	Merge pull request #408 from matrix-org/markjh/distributor_facade ... Wrap calls to distributor.fire in appropriately named functions	2015-12-02 09:44:56 +00:00
Erik Johnston	9670f226e3	Merge pull request #406 from matrix-org/erikj/search ... Search: Don't disregard grouping info in pagination tokens	2015-12-02 09:13:20 +00:00
Mark Haines	a9526831a4	Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what	2015-12-01 20:53:04 +00:00
Mark Haines	ed0f79bdc5	Only fire user_joined_room if the membership has changed	2015-12-01 19:46:15 +00:00
Mark Haines	f73ea0bda2	Merge branch 'develop' into markjh/edu_frequency	2015-12-01 19:15:27 +00:00
Mark Haines	95f30ecd1f	Add API for setting account_data globaly or on a per room basis	2015-12-01 18:41:32 +00:00
Erik Johnston	27c5e1b374	Search: Don't disregard grouping info in pagination tokens	2015-12-01 16:47:18 +00:00
Mark Haines	af96c6f4d3	Merge pull request #404 from matrix-org/markjh/trivial_rename ... Rename presence_handler.send_invite	2015-12-01 16:11:03 +00:00
Mark Haines	3d3da2b460	Only fire user_joined_room on the distributor if the user has actually joined the room	2015-12-01 16:03:08 +00:00
Mark Haines	31069ecf6a	Rename presence_handler.send_invite to presence_handler.send_presence_invite to distinguish it from normal invites	2015-12-01 15:59:45 +00:00
Erik Johnston	71578e2bf2	Change the result tict to be a list	2015-12-01 14:48:35 +00:00
Erik Johnston	da7dd58641	Tidy up a bit	2015-12-01 11:06:40 +00:00
Erik Johnston	4dcaa42b6d	Allow paginating search ordered by recents	2015-11-30 17:45:31 +00:00
Erik Johnston	76936f43ae	Return words to highlight in search results	2015-11-27 16:40:42 +00:00
Daniel Wagner-Hall	924d85a75e	Merge pull request #375 from matrix-org/daniel/guestroominitialsync ... Clean up room initialSync for guest users	2015-11-23 16:10:49 +00:00
Mark Haines	c6a15f5026	Merge pull request #385 from matrix-org/daniel/forgetrooms ... Allow users to forget rooms	2015-11-20 18:07:26 +00:00
Erik Johnston	6b95a79724	Add option to include the current room state	2015-11-20 14:16:42 +00:00
Erik Johnston	506874cca9	Optionally include historic profile info	2015-11-20 11:39:44 +00:00
Paul "LeoNerd" Evans	1cfda3d2d8	Merge branch 'develop' into daniel/forgetrooms	2015-11-19 16:53:13 +00:00
Mark Haines	7a802ec0ff	Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data ... s/private_user_data/account_data/	2015-11-19 15:21:35 +00:00
Daniel Wagner-Hall	248cfd5eb3	Take a boolean not a list of lambdas	2015-11-19 15:16:25 +00:00
Daniel Wagner-Hall	9da4c5340d	Simplify code	2015-11-19 10:07:21 -05:00
Daniel Wagner-Hall	bed7889703	Apply forgetting properly to historical events	2015-11-18 18:11:12 -05:00
Mark Haines	1c960fbb80	s/private_user_data/account_data/	2015-11-18 15:31:04 +00:00