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

..

app_plugin.go

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

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

dashboard_installer.go

feat(plugins): more work on plugin dashboard install, #4298

2016-03-11 12:31:56 +01:00

dashboards_test.go

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

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

dashboards.go

feat(plugins): more work on plugin dashboard install, #4298

2016-03-11 12:31:56 +01:00

datasource_plugin.go

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

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

frontend_plugin.go

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

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

models.go

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

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

panel_plugin.go

feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974

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

plugins_test.go

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

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

plugins.go

fix(plugins): fixes missed dist loading for plugindir

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

queries.go

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

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