Torkel Ödegaard f9b628ad0e Merge branch 'v3.1.x' ...

Conflicts:
	conf/defaults.ini
	conf/sample.ini
	pkg/metrics/graphite.go
	pkg/metrics/graphite_test.go

2016-08-17 09:53:46 +02:00

..

api

(cloudwatch) support ApplicationELB (#5802)

2016-08-14 13:21:17 +02:00

bus

clarify which handler is not found

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

cmd

feat(cli): add default plugin folder for MAC OS

2016-08-15 09:18:56 +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

fix(build): another windows build issue

2016-06-16 21:10:30 +02:00

login

Warn user if there are no mappings (#5246)

2016-07-06 07:31:42 +02:00

metrics

Merge branch 'v3.1.x'

2016-08-17 09:53:46 +02:00

middleware

tech(tests): remove unused code that breaks gorename

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

models

feat(apps): more work on plugin dashboard sync

2016-07-08 13:41:46 +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(apps): more work on plugin dashboard sync

2016-07-08 13:41:46 +02:00

setting

Log to default log directory, only if custom configuration failed. (#5393)

2016-06-30 16:37:06 -07:00

social

gofmt happiness

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

util

test(util): add unit test for string util

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