Torkel Ödegaard 0d083bad14 Merge branch 'master' of github.com:grafana/grafana ...

Conflicts:
	pkg/components/imguploader/s3uploader.go

2016-09-07 10:14:36 +02:00

..

api

tech(notifications): splitt into 3 queries

2016-09-06 08:43:15 +02:00

bus

clarify which handler is not found

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

cmd

fix(cli): improve error message for upgrade-all

2016-08-30 13:47:42 +02:00

components

Merge branch 'master' of github.com:grafana/grafana

2016-09-07 10:14:36 +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

feat(alerting): progress on handling no data in alert query, #5860

2016-09-06 20:40:12 +02:00

middleware

tech(tests): remove unused code that breaks gorename

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

models

feat(alerting): progress on handling no data in alert query, #5860

2016-09-06 20:40:12 +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): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations

2016-09-07 10:11:00 +02:00

setting

redact provider_config (#5915)

2016-08-27 09:50:35 +02:00

social

gofmt happiness

2015-11-07 11:32:06 -06:00

tsdb

feat(alerting): fixed s3 upload issue, progress on alerting on null/missing data, updated ini package to get the support for line continuations

2016-09-07 10:11:00 +02:00

util

test(util): add unit test for string util

2016-06-03 15:06:54 +02:00