6387 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	937c407eef	Only import email pusher if email notifs are on	2016-04-28 15:12:14 +01:00
Mark Haines	dcfc10b129	Fix typo in request metrics	2016-04-28 15:11:06 +01:00
Matthew Hodgson	aebd0c9717	fix typo	2016-04-28 15:09:25 +01:00
Mark Haines	1c188cf73c	Merge pull request #756 from matrix-org/markjh/more_metrics ... Report per request metrics for all of the things using request_handler	2016-04-28 14:59:45 +01:00
Mark Haines	1a12766e3b	Add a comment explaining why automatic metric reporting is disabled for JsonResource	2016-04-28 12:31:26 +01:00
Mark Haines	6037349512	Check if report_metrics is True	2016-04-28 12:26:07 +01:00
David Baker	ebbabc4986	Handle room invites in email notifs	2016-04-28 11:49:36 +01:00
Mark Haines	8d7ad44331	Report per request metrics for all of the things using request_handler	2016-04-28 10:57:49 +01:00
David Baker	5367708236	Add the jinja template for individual notifs	2016-04-28 10:55:32 +01:00
David Baker	9dba1b668c	Linkify plain text messages too	2016-04-28 10:55:08 +01:00
David Baker	424a7f48f8	Run filter_events_for_client ... so we don't accidentally mail out events people shouldn't see	2016-04-27 17:50:49 +01:00
David Baker	4ed1e45869	Make html messages work	2016-04-27 17:18:51 +01:00
Mark Haines	21d188bf95	Merge pull request #755 from matrix-org/markjh/right_direction ... Fix backfill replication to advance the stream correctly	2016-04-27 15:54:48 +01:00
Mark Haines	8a65666454	Fix backfill replication to advance the stream correctly	2016-04-27 15:38:43 +01:00
David Baker	8781083960	Better grammar for multiple messages in a room ... Say who the messages are from if there's no room name, otherwise it's a bit nonsensical	2016-04-27 15:30:41 +01:00
David Baker	fa12209c1b	Hopefully all remaining bits for email notifs ... Add public facing base url to the server so synapse knows what URL to use when converting mxc to http urls for use in emails	2016-04-27 15:09:55 +01:00
Mark Haines	c7c03bf303	Merge pull request #754 from matrix-org/markjh/check_for_nop ... Check that something has happend before running the selects	2016-04-27 13:36:47 +01:00
Mark Haines	871357d539	Check that somethign has happend before running the selects	2016-04-27 11:54:13 +01:00
Mark Haines	71df327190	Actually start the pusher daemon	2016-04-26 17:07:09 +01:00
Mark Haines	c9eab73f2a	Fix typo in default pusher config	2016-04-26 17:06:18 +01:00
Mark Haines	47571d11db	Merge pull request #753 from matrix-org/markjh/daemon_pusher ... Optionally daemonize the pusher	2016-04-26 16:11:44 +01:00
Mark Haines	b80b93ea0f	Add a log context to the daemonized pusher	2016-04-26 15:57:28 +01:00
Mark Haines	6df5a6a833	Optionally daemonize the pusher	2016-04-26 15:37:41 +01:00
Erik Johnston	3306cf45ca	Merge pull request #750 from matrix-org/erikj/jwt_optional ... Make pyjwt dependency optional	2016-04-26 11:07:22 +01:00
Mark Haines	c487c42492	Merge pull request #752 from matrix-org/markjh/more_updates ... Add a couple of update methods to the PusherSlaveStore	2016-04-26 11:00:40 +01:00
Mark Haines	9c417c54d4	Add a couple of update methods to the PusherSlaveStore	2016-04-26 10:45:02 +01:00
Mark Haines	9843f2a657	Merge pull request #751 from matrix-org/markjh/pusher_metrics_manhole ... Add a metrics listener and a ssh listener to the pusher	2016-04-26 10:35:51 +01:00
David Baker	7b4715bad7	More variable calculation for email notifs ... Include name of the person we're sending to and add summary text at the top giving an overview of what's happened.	2016-04-25 18:27:04 +01:00
Mark Haines	f15e9e8de4	Remove the uncomments from the comments	2016-04-25 17:56:24 +01:00
Mark Haines	72e2fafa20	Add a metrics listener and a ssh listener to the pusher	2016-04-25 17:34:25 +01:00
Mark Haines	233bf78ab4	Merge pull request #749 from matrix-org/markjh/split_manhole ... Split out setting up the manhole to a separate file	2016-04-25 15:23:53 +01:00
Mark Haines	f22f46f4f9	Move the listenTCP call outside the manhole function	2016-04-25 14:59:21 +01:00
David Baker	290f125a13	Typo	2016-04-25 14:42:59 +01:00
Erik Johnston	52ecbc2843	Make pyjwt dependency optional	2016-04-25 14:30:15 +01:00
David Baker	05e49ffbdf	No we don't: it's just the display name	2016-04-22 18:44:17 +01:00
David Baker	bd0f9c2065	Actually do UTF8 correctly	2016-04-22 18:42:00 +01:00
David Baker	c5b3c6e101	Sort member events ... So names of people in a room are given in order	2016-04-22 18:33:36 +01:00
David Baker	83bf65297a	Mime part is binary so encode it first. ... Doesn't get character enocind right yet but makes it not error.	2016-04-22 18:31:47 +01:00
David Baker	e8701e64b9	Implement group-of-people names	2016-04-22 17:28:42 +01:00
David Baker	c553797c4f	No inlineCallbacks necessary on this	2016-04-22 17:27:54 +01:00
Mark Haines	5905f36f05	Split out setting up the manhole to a separate file	2016-04-22 17:09:15 +01:00
Mark Haines	c3f8dbf6b5	Merge pull request #748 from matrix-org/markjh/split_out_site.py ... Move SynapseSite to its own file	2016-04-22 17:08:21 +01:00
Mark Haines	62607d5452	Merge branch 'develop' into markjh/split_out_site.py ... Conflicts: synapse/app/homeserver.py	2016-04-22 16:26:57 +01:00
Mark Haines	e57df8fa86	Merge pull request #747 from matrix-org/markjh/http_resource_tree ... Split out create_resource_tree to a separate file	2016-04-22 16:24:55 +01:00
Mark Haines	e856036f4c	Move SynapseSite to its own file	2016-04-22 16:09:55 +01:00
Mark Haines	9e7aa98c22	Split out create_resource_tree to a separate file	2016-04-22 15:40:51 +01:00
Mark Haines	2022ae0fb9	Merge pull request #746 from matrix-org/markjh/split_out_pusher ... Optionally split out the pushers into a separate process	2016-04-22 11:34:08 +01:00
Erik Johnston	64ec3493c1	Merge pull request #745 from matrix-org/erikj/search-index ... Optimise event_search in postgres	2016-04-22 11:23:49 +01:00
Erik Johnston	4063fe0283	Update port script	2016-04-22 10:35:53 +01:00
Erik Johnston	183cacac90	Simplify query and handle finishing correctly	2016-04-22 10:01:57 +01:00