From 4f261389db0ac42a5662eef3b42045824a12e8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 20 Sep 2014 16:55:02 +0200 Subject: [PATCH 1/5] changed placement of color selector popup --- src/app/panels/graph/legend.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/panels/graph/legend.html b/src/app/panels/graph/legend.html index 0e5edc459ce..31458060803 100755 --- a/src/app/panels/graph/legend.html +++ b/src/app/panels/graph/legend.html @@ -5,7 +5,7 @@ ng-class="{'pull-right': series.yaxis === 2, 'graph-legend-series-hidden': hiddenSeries[series.alias]}" >
- +
From e82d17104185f9565c8cc0500c67ed517fe1fb5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 21 Sep 2014 08:19:41 +0200 Subject: [PATCH 2/5] Dashboard: when opening search or dashboard settings, click the icon again will now hide the view, Closes #836 --- src/app/directives/dashEditLink.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/directives/dashEditLink.js b/src/app/directives/dashEditLink.js index fbdfc4fa5cc..599cf341fe5 100644 --- a/src/app/directives/dashEditLink.js +++ b/src/app/directives/dashEditLink.js @@ -51,9 +51,12 @@ function (angular, $) { scope.onAppEvent('hide-dash-editor', hideEditorPane); scope.onAppEvent('show-dash-editor', function(evt, payload) { - hideEditorPane(); + if (lastEditor === payload.src) { + hideEditorPane(); + return; + } - if (lastEditor === payload.src) { return; } + hideEditorPane(); scope.exitFullscreen(); From 010baad5327afb67909be3aee81400ac12416fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 22 Sep 2014 12:54:02 +0200 Subject: [PATCH 3/5] Dashboard: fixed init of editable setting, #837 --- src/app/services/dashboard/dashboardSrv.js | 2 +- src/test/specs/dashboardSrv-specs.js | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/app/services/dashboard/dashboardSrv.js b/src/app/services/dashboard/dashboardSrv.js index c6b386917ba..17313a207d5 100644 --- a/src/app/services/dashboard/dashboardSrv.js +++ b/src/app/services/dashboard/dashboardSrv.js @@ -25,7 +25,7 @@ function (angular, $, kbn, _, moment) { this.tags = data.tags || []; this.style = data.style || "dark"; this.timezone = data.timezone || 'browser'; - this.editable = data.editable || true; + this.editable = data.editable === false ? false : true; this.hideControls = data.hideControls || false; this.rows = data.rows || []; this.nav = data.nav || []; diff --git a/src/test/specs/dashboardSrv-specs.js b/src/test/specs/dashboardSrv-specs.js index f916279db98..862c2a6fc41 100644 --- a/src/test/specs/dashboardSrv-specs.js +++ b/src/test/specs/dashboardSrv-specs.js @@ -82,6 +82,22 @@ define([ }); + describe('when creating dashboard with editable false', function() { + var model; + + beforeEach(module('grafana.services')); + beforeEach(inject(function(dashboardSrv) { + model = dashboardSrv.create({ + editable: false + }); + })); + + it('should set editable false', function() { + expect(model.editable).to.be(false); + }); + + }); + describe('when creating dashboard with old schema', function() { var model; var graph; From 352ad3385a2f9686df8bba674cf2595a00181b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 22 Sep 2014 12:59:21 +0200 Subject: [PATCH 4/5] Updated changelog and package.json to new version 1.8.0 --- CHANGELOG.md | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69835953dc1..8d28e9223f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ -# 1.8.0 (unreleased) +# 1.8.0 (2014-09-22) + +Read this [blog post](http://grafana.org/blog/2014/09/11/grafana-1-8-0-rc1-released.html) for an overview of all improvements. **Fixes** - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource diff --git a/package.json b/package.json index f84ca9cf8c6..8de8f05cf8a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "company": "Coding Instinct AB" }, "name": "grafana", - "version": "1.8.0-rc1", + "version": "1.8.0", "repository": { "type": "git", "url": "http://github.com/torkelo/grafana.git" From 7fe76d32d075a62189e3b4c3529699f1003e341a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 22 Sep 2014 13:05:44 +0200 Subject: [PATCH 5/5] updated latest.json --- latest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/latest.json b/latest.json index c66de1bc179..6e7dc07bae2 100644 --- a/latest.json +++ b/latest.json @@ -1,4 +1,4 @@ { - "version": "1.8.0-rc1", - "url": "http://grafanarel.s3.amazonaws.com/grafana-1.8.0-rc1" + "version": "1.8.0", + "url": "http://grafanarel.s3.amazonaws.com/grafana-1.8.0.tar.gz" }