Torkel Ödegaard ec0b09450c Merge branch 'export-dashboard' ...

Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js

2016-06-16 08:06:43 +02:00

..

api

Merge branch 'export-dashboard'

2016-06-16 08:06:43 +02:00

bus

clarify which handler is not found

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

cmd

feat(loggin): improved http request panic handling

2016-06-07 10:05:10 +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(loggin): disable logging by default so unit tests are not full of logging

2016-06-11 11:38:25 +02:00

login

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

2016-06-08 08:10:22 +02:00

metrics

fix(metrics): 64bit aligns standardcounter

2016-06-13 06:56:16 +02:00

middleware

feat(logging): error logging improvements

2016-06-11 12:16:33 +02:00

models

feat(import): save gnetId for dashbards imported from grafana.net

2016-05-27 16:42:32 +02:00

plugins

Merge branch 'export-dashboard'

2016-06-16 08:06:43 +02:00

services

Merge branch 'export-dashboard'

2016-06-16 08:06:43 +02:00

setting

Merge branch 'export-dashboard'

2016-06-16 08:06:43 +02: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