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
..
app_plugin.go	feat(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled	2016-05-03 19:00:42 +02:00
dashboard_importer_test.go	feat(plugins): added prometheus dashboard to prometheus data source, #4298	2016-03-12 10:40:55 +01:00
dashboard_importer.go	feat(export): began working on export modal	2016-05-17 10:29:57 +02:00
dashboards_test.go	refactor(): refactoring json usage	2016-03-12 00:13:06 +01:00
dashboards.go	feat(import): more import work	2016-05-14 10:00:43 +02:00
datasource_plugin.go	feat(plugins): a lot of work on #4298	2016-03-08 18:17:47 +01:00
frontend_plugin.go	feat(): plugin list panel	2016-04-08 16:42:33 -04:00
models.go	feat(logging): a lot of progress on moving to new logging lib, #4590	2016-06-06 23:06:44 +02: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	feat(logging): a lot of progress on moving to new logging lib, #4590	2016-06-06 23:06:44 +02:00
queries.go	fix(pluginlist): fixed issue with plugin list, fixes #5068	2016-05-17 21:51:19 +02:00
update_checker.go	Fix typo in error message from update checker	2016-05-10 16:06:51 +00:00