Torkel Ödegaard 9216492d55 Merge branch 'alert_handles' into alert_ui_take2 ...

Conflicts:
	pkg/services/alerting/commands.go

2016-06-13 07:53:13 +02:00

..

alerting

Merge branch 'alert_handles' into alert_ui_take2

2016-06-13 07:53:13 +02:00

eventpublisher

no unbound recursion in publish()

2015-05-18 10:04:01 -04:00

notifications

fix(email notifications): added error handling to email template parsing, fixes #2690

2015-09-08 10:57:47 +02:00

search

Enable the "limit" param in /api/search

2016-06-06 16:15:20 +00:00

sqlstore

feat(alerting): alert threshold handles progress

2016-06-11 22:33:02 +02:00