Torkel Ödegaard 77c66a88d9 Merge branch 'master' into alerting		2016-07-27 10:22:00 +02:00
..
api	Merge branch 'alert_conditions' into alerting	2016-07-27 09:52:42 +02:00
bus	clarify which handler is not found	2015-06-26 12:32:24 -07:00
cmd	Merge branch 'master' into alerting	2016-07-27 10:22:00 +02:00
components	[RenderToPng fix] (#4901)	2016-05-04 09:07:45 +02:00
events	feat(signup): progress on new sign up and email verification flow, #2353	2015-08-28 15:14:24 +02:00
log	feat(alerting): progress on email notifications	2016-07-26 12:29:52 +02:00
login	Warn user if there are no mappings (#5246)	2016-07-06 07:31:42 +02:00
metrics	fix(metrics): 64bit aligns standardcounter	2016-06-13 06:56:16 +02:00
middleware	tech(tests): remove unused code that breaks gorename	2016-06-25 16:34:42 +02:00
models	feat(alerting): started reworking notifications	2016-07-22 16:45:17 +02:00
plugins	feat(table): added sanitize html option to column styles for table panel, fixes #4596	2016-07-11 09:38:06 +02:00
services	feat(alerting): progress on email notifications	2016-07-26 12:29:52 +02:00
setting	Merge branch 'master' into alerting	2016-07-11 18:28:07 +02:00
social	gofmt happiness	2015-11-07 11:32:06 -06:00
tsdb	feat(alerting): test results look better	2016-07-21 13:57:19 +02:00
util	test(util): add unit test for string util	2016-06-03 15:06:54 +02:00