6445 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	fee1118a20	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user	2016-05-04 19:08:27 +01:00
Erik Johnston	97b9141245	Merge pull request #762 from matrix-org/erikj/report_event ... Add /report endpoint	2016-05-04 19:05:49 +01:00
Erik Johnston	fcd1eb642d	Add primary key	2016-05-04 16:51:51 +01:00
Erik Johnston	8e6a163f27	Add timestamp and auto incrementing ID	2016-05-04 15:19:12 +01:00
David Baker	39d0a99972	Include no context ... until we can de-dup between the context and other notifs	2016-05-04 14:52:49 +01:00
David Baker	9ef05a12c3	Add date header & message id	2016-05-04 14:52:10 +01:00
David Baker	80be396464	Correct SQL statement for postgres ... In standard sql, join binds tighter than comma, so we were joining on the wrong table. Postgres follows the standard (apparently).	2016-05-04 13:19:59 +01:00
Erik Johnston	5650e38e7d	Move event_id to path	2016-05-04 13:19:39 +01:00
Matthew Hodgson	8a04412fa1	starting point for doc on how log contexts are supposed to work	2016-05-04 12:19:04 +01:00
David Baker	8cc82aad87	Add db functions used for email to the pusher app	2016-05-04 11:47:59 +01:00
David Baker	de22001ab5	pep8	2016-05-04 11:41:35 +01:00
Matthew Hodgson	f1026418ea	copyright	2016-05-04 11:38:01 +01:00
Matthew Hodgson	17cbf773b9	fix assorted typos in default config	2016-05-04 11:38:01 +01:00
Erik Johnston	984d4a2c0f	Add /report endpoint	2016-05-04 11:28:10 +01:00
David Baker	e6bffa4475	Unused import	2016-05-04 11:26:58 +01:00
David Baker	92f0f3d21d	Catch all exceptions when creating a pusher	2016-05-04 11:24:07 +01:00
Erik Johnston	a438a6d2bc	Implement basic ignore user	2016-05-04 10:16:46 +01:00
Erik Johnston	7ea3b4118d	Merge pull request #757 from matrix-org/erikj/event_auth_typo ... Fix typo in event_auth servlet path	2016-05-03 14:23:15 +01:00
Erik Johnston	183f23f10d	Delete old pushers	2016-05-03 14:22:33 +01:00
Matthew Hodgson	792def4928	add a url_preview_ip_range_whitelist config param so we can whitelist the matrix.org IP space	2016-05-01 12:44:24 +01:00
David Baker	2df75de505	Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs	2016-04-29 20:28:47 +01:00
David Baker	b084e4d963	Add constant for throttle multiplier	2016-04-29 20:14:55 +01:00
David Baker	35b7b8e4bc	Remove unused function	2016-04-29 20:10:34 +01:00
David Baker	6b9b6a9169	Remove unused arg	2016-04-29 20:02:52 +01:00
David Baker	c7c75e87dc	Docstring	2016-04-29 19:47:35 +01:00
David Baker	b0a1036d93	Use explicit join	2016-04-29 19:28:56 +01:00
David Baker	8f99cd5996	Oops, actually specify the user id	2016-04-29 19:27:03 +01:00
David Baker	60f44c098d	Remove unnecessary if	2016-04-29 19:17:10 +01:00
David Baker	50ad8005e4	Put spaces at start of line	2016-04-29 19:16:15 +01:00
David Baker	83618d719a	Try imports in config	2016-04-29 19:13:52 +01:00
David Baker	e7a76b5123	Use the constant	2016-04-29 19:10:45 +01:00
David Baker	29c8cf8db8	Avoid vars builtin	2016-04-29 19:09:28 +01:00
David Baker	d3da5294e8	Use named parameter format	2016-04-29 19:04:40 +01:00
David Baker	765f2b8446	Default enable email notifs to False	2016-04-29 14:46:18 +01:00
David Baker	ff5e5423e5	Include res in the manifest	2016-04-29 14:43:48 +01:00
David Baker	311b5ce051	pep8	2016-04-29 14:37:30 +01:00
David Baker	3facde2536	Remove rather pointless get function	2016-04-29 14:36:45 +01:00
David Baker	4364ea1272	Stop processing notifs once we've sent a mail	2016-04-29 14:31:27 +01:00
David Baker	4b0c3a3270	Correct public_baseurl default	2016-04-29 14:30:15 +01:00
David Baker	5048455965	Nicer get() shorthand	2016-04-29 14:27:40 +01:00
David Baker	6c8957be7f	Remove redundant docstring	2016-04-29 14:25:28 +01:00
David Baker	18ce88bd2d	Correct default template and add text template	2016-04-29 14:24:25 +01:00
David Baker	40d40e470d	Send mail notifs with a plaintext part too	2016-04-29 13:56:21 +01:00
David Baker	56aae0eaf5	Merge pull request #758 from matrix-org/dbkr/fix_password_reset ... Fix password reset	2016-04-29 12:45:39 +01:00
David Baker	dc2c527ce9	Fix password reset ... Default requester to None, otherwise it isn't defined when resetting using email auth	2016-04-29 12:07:54 +01:00
Erik Johnston	62b51b8452	Fix typo in event_auth servlet path	2016-04-29 12:00:51 +01:00
David Baker	b2c04da8dc	Add an email pusher for new users ... If they registered with an email address and email notifs are enabled on the HS	2016-04-29 11:43:57 +01:00
David Baker	ec9cbe847d	pep8 newline	2016-04-29 10:07:30 +01:00
David Baker	acded821c4	Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs	2016-04-29 10:05:20 +01:00
David Baker	69e519052b	Remove vector specific style	2016-04-28 17:34:32 +01:00