grafana/public/app/plugins
Torkel Ödegaard 201f50b121 Merge branch 'master' into external-plugins
Conflicts:
	pkg/api/login.go
	public/app/core/routes/all.js
	public/app/core/table_model.ts
	public/app/panels/table/table_model.ts
	public/app/plugins/panels/table/editor.ts
	public/app/plugins/panels/table/table_model.ts
2015-12-14 17:28:57 +01:00
..
datasource feat(elasticsearch): only show pipeline agg for es version >= 2 2015-12-14 15:08:34 +01:00
external/example feat(plugins): made panels work as plugins 2015-11-21 13:46:43 +01:00
panels Merge branch 'master' into external-plugins 2015-12-14 17:28:57 +01:00
plugin_api.md feat(plugins): made panels work as plugins 2015-11-21 13:46:43 +01:00
plugin.json add pluginBundle backend api methods and SQL storage 2015-12-03 23:43:55 +08:00