Torkel Ödegaard 9f29c54170 Merge branch 'query_part_refactor' into alerting ...

Conflicts:
	pkg/services/sqlstore/migrations/alert_mig.go
	pkg/services/sqlstore/migrations/heartbeat_mig.go

2016-08-15 17:54:42 +02:00

..

api

Merge branch 'master' into alerting

2016-08-15 07:58:30 +02:00

bus

clarify which handler is not found

2015-06-26 12:32:24 -07:00

cmd

feat(alerting): lots of progress on notifications, refactored them out to their own package, restored webhook notitication and added slack notification

2016-07-27 12:09:55 +02:00

components

feat(alerting): add support for uploading images to webdav.

2016-08-11 16:48:54 +02:00

events

feat(signup): progress on new sign up and email verification flow, #2353

2015-08-28 15:14:24 +02:00

Godeps

updated dependencies

2016-08-01 14:15:41 +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

Merge branch 'master' into alerting

2016-08-15 07:58:30 +02:00

middleware

tech(tests): remove unused code that breaks gorename

2016-06-25 16:34:42 +02:00

models

feat(alerting): doing schema changes

2016-08-15 15:12:43 +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

Merge branch 'query_part_refactor' into alerting

2016-08-15 17:54:42 +02:00

setting

feat(alerting): add support for uploading images to webdav.

2016-08-11 16:48:54 +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