Merge branch 'master' of github.com:torkelo/grafana-private into pro

src/app/features/dashboard/timeSrv.js

@@ -94,7 +94,7 @@ define([
 
 
       // disable refresh if we have an absolute time
       // disable refresh if we have an absolute time
       if (time.to !== 'now') {
       if (time.to !== 'now') {
-        this.old_refresh = this.dashboard.refresh;
+        this.old_refresh = this.dashboard.refresh || this.old_refresh;
         this.set_interval(false);
         this.set_interval(false);
       }
       }
       else if (this.old_refresh && this.old_refresh !== this.dashboard.refresh) {
       else if (this.old_refresh && this.old_refresh !== this.dashboard.refresh) {

src/app/panels/graph/graph.js

@@ -319,7 +319,7 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
               types[event.annotation.name] = {
               types[event.annotation.name] = {
                 level: _.keys(types).length + 1,
                 level: _.keys(types).length + 1,
                 icon: {
                 icon: {
-                  icon: "icon-chevron-down",
+                  icon: "fa fa-chevron-down",
                   size: event.annotation.iconSize,
                   size: event.annotation.iconSize,
                   color: event.annotation.iconColor,
                   color: event.annotation.iconColor,
                 }
                 }