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

Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json

2016-03-11 12:39:10 +01:00

..

api

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

2016-03-11 12:39:10 +01:00

bus

clarify which handler is not found

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

cmd

feat(cli): disable dependecy downloads until needed

2016-03-10 17:16:01 +01:00

components

feat(renderer): add timeout for the renderer api

2016-03-10 16:02:10 +01:00

events

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

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

log

allow setting level on logger.

2016-02-18 16:46:47 +11:00

login

minor spelling corrections

2016-02-16 12:12:04 +11:00

metrics

feat(playlist): add usage statisics

2016-01-25 21:39:45 +01:00

middleware

minor spelling corrections

2016-02-16 12:12:04 +11:00

models

feat(plugins): progress on dashboard installs , #4298

2016-03-11 09:57:20 +01:00

plugins

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

2016-03-11 12:39:10 +01:00

services

feat(plugins): a lot of work on #4298

2016-03-08 18:17:47 +01:00

setting

redact settings containing 'secret' besides 'password'

2016-03-01 13:50:45 -05:00

social

gofmt happiness

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

util

fix(plugins): fixes missed dist loading for plugindir

2016-03-03 11:04:26 +01:00