6742 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	a7ff5a1770	Presence metrics. Change def of small delta	2016-06-03 13:40:55 +01:00
Matthew Hodgson	aa6fab0cc2	Merge pull request #822 from matrix-org/matthew/brand-from-header ... brand the email from header	2016-06-03 12:15:01 +01:00
Matthew Hodgson	8d740132f4	Merge branch 'develop' into matthew/brand-from-header	2016-06-03 12:14:18 +01:00
Erik Johnston	3b096c5f5c	Merge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into develop	2016-06-03 12:00:33 +01:00
Erik Johnston	43b7f371f5	Merge pull request #830 from matrix-org/erikj/metrics_perf ... Change CacheMetrics to be quicker	2016-06-03 11:57:29 +01:00
Mark Haines	abb151f3c9	Add a separate process that can handle /sync requests	2016-06-03 11:57:26 +01:00
Erik Johnston	4982b28868	Merge pull request #829 from matrix-org/erikj/poke_notifier ... Poke notifier on next reactor tick	2016-06-03 11:52:10 +01:00
Erik Johnston	d06f2a229e	Merge pull request #828 from matrix-org/erikj/joined_hosts_for_room ... Make get_joined_hosts_for_room use get_users_in_room	2016-06-03 11:50:30 +01:00
Erik Johnston	58a224a651	Pull out update_results_dict	2016-06-03 11:47:07 +01:00
Mark Haines	20eccd84d4	Merge pull request #827 from matrix-org/markjh/more_slaved_methods ... Add methods to events, account data and receipt slaves	2016-06-03 11:46:21 +01:00
Erik Johnston	722472b48c	Merge pull request #825 from matrix-org/erikj/cache_push_rules ... Load push rules in storage layer so that they get cached	2016-06-03 11:44:32 +01:00
Erik Johnston	73c7112433	Change CacheMetrics to be quicker ... We change it so that each cache has an individual CacheMetric, instead of having one global CacheMetric. This means that when a cache tries to increment a counter it does not need to go through so many indirections.	2016-06-03 11:26:52 +01:00
Mark Haines	b09f348530	Merge pull request #824 from matrix-org/markjh/slaved_presence_store ... Add a slaved store for presence	2016-06-03 11:26:33 +01:00
Erik Johnston	4c04222fa5	Poke notifier on next reactor tick	2016-06-03 11:24:16 +01:00
Erik Johnston	ccb56fc24b	Make get_joined_hosts_for_room use get_users_in_room	2016-06-03 11:20:23 +01:00
Mark Haines	81cf449daa	Add methods to events, account data and receipt slaves ... Adds the methods needed by /sync to the slaved events, account data and receipt stores.	2016-06-03 11:19:27 +01:00
Erik Johnston	e043ede4a2	Small optimisation to CacheListDescriptor	2016-06-03 11:19:22 +01:00
Mark Haines	b821c839dc	Merge pull request #823 from matrix-org/markjh/more_slaved_stores ... Add slaved stores for filters, tokens, and push rules	2016-06-03 11:17:43 +01:00
Erik Johnston	597013caa5	Make cachedList go a bit faster	2016-06-03 11:13:29 +01:00
Erik Johnston	6a0afa582a	Load push rules in storage layer, so that they get cached	2016-06-03 11:10:00 +01:00
Mark Haines	3ae915b27e	Add a slaved store for presence	2016-06-03 11:05:53 +01:00
Erik Johnston	59f2d73522	Remove unnecessary sets	2016-06-03 11:05:45 +01:00
Erik Johnston	9c26b390a2	Only get local users	2016-06-03 11:04:31 +01:00
Mark Haines	f88d747f79	Add a comment explaining why the filter cache doesn't need exipiring	2016-06-03 11:03:10 +01:00
Erik Johnston	065e739d6e	Merge pull request #811 from matrix-org/erikj/state_users_in_room ... Use state to calculate get_users_in_room	2016-06-03 10:58:27 +01:00
Erik Johnston	696d7c5937	Merge pull request #809 from matrix-org/erikj/cache_receipts_in_room ... Add get_users_with_read_receipts_in_room cache	2016-06-03 10:58:24 +01:00
Mark Haines	0eae075723	Add slaved stores for filters, tokens, and push rules	2016-06-03 10:58:03 +01:00
Matthew Hodgson	79d1f072f4	brand the email from header	2016-06-02 21:34:40 +01:00
David Baker	6bb9aacf9d	Merge pull request #821 from matrix-org/dbkr/email_unsubscribe ... Email unsubscribe links that don't require logging in	2016-06-02 17:44:55 +01:00
David Baker	745ddb4dd0	peppate	2016-06-02 17:38:41 +01:00
David Baker	7a5a5f2df2	Merge pull request #820 from matrix-org/dbkr/email_notif_string_fmt_error ... Fix error in email notification string formatting	2016-06-02 17:26:06 +01:00
David Baker	1f31cc37f8	Working unsubscribe links going straight to the HS ... and authed by macaroons that let you delete pushers and nothing else	2016-06-02 17:21:31 +01:00
Matthew Hodgson	2675c1e40e	add some branding debugging	2016-06-02 17:21:12 +01:00
David Baker	c71177f285	Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into dbkr/email_unsubscribe	2016-06-02 17:20:56 +01:00
David Baker	07a5559916	Fix error in email notification string formatting	2016-06-02 17:17:16 +01:00
Mark Haines	56d15a0530	Store the typing users as user_id strings. (#819) ... Rather than storing them as UserID objects.	2016-06-02 16:28:54 +01:00
David Baker	812b5de0fe	Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe	2016-06-02 15:33:28 +01:00
Mark Haines	80f34d7b57	Fix setting the _clock in SQLBaseStore	2016-06-02 15:23:56 +01:00
Mark Haines	661a540dd1	Deduplicate presence entries in sync (#818)	2016-06-02 15:20:28 +01:00
Mark Haines	70599ce925	Allow external processes to mark a user as syncing. (#812) ... * Add infrastructure to the presence handler to track sync requests in external processes * Expire stale entries for dead external processes * Add an http endpoint for making users as syncing Add some docstrings and comments. * Fixes	2016-06-02 15:20:15 +01:00
David Baker	fb2193cc63	Merge pull request #817 from matrix-org/dbkr/split_out_auth_handler ... Split out the auth handler	2016-06-02 14:31:35 +01:00
Erik Johnston	356f13c069	Disable INCLUDE_ALL_UNREAD_NOTIFS	2016-06-02 14:07:38 +01:00
Erik Johnston	02ac463dbf	Merge pull request #800 from matrix-org/erikj/sync_refactor ... Refactor SyncHandler	2016-06-02 14:02:13 +01:00
Matthew Hodgson	c5af1b6b00	Merge pull request #814 from matrix-org/matthew/3pid_invite_auth ... special case m.room.third_party_invite event auth to match invites,	2016-06-02 13:47:40 +01:00
David Baker	3a3fb2f6f9	Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe	2016-06-02 13:35:25 +01:00
David Baker	4a10510cd5	Split out the auth handler	2016-06-02 13:31:45 +01:00
Matthew Hodgson	f84b89f0c6	if an email pusher specifies a brand param, use it	2016-06-02 13:29:48 +01:00
David Baker	a15ad60849	Email unsubscribing that may in theory, work ... Were it not for that fact that you can't use the base handler in the pusher because it pulls in the world. Comitting while I fix that on a different branch.	2016-06-02 11:44:15 +01:00
David Baker	07233a1ec8	Merge pull request #815 from matrix-org/dbkr/email_greeting_not_none ... Use user_id in email greeting if display name is null	2016-06-02 09:52:19 +01:00
David Baker	e793866398	Use user_id in email greeting if display name is null	2016-06-02 09:41:13 +01:00