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

Conflicts:
	src/app/directives/dashEditLink.js

src/app/directives/dashEditLink.js

@@ -102,6 +102,7 @@ function (angular, $) {
             }
           });
 
+          scope.$on("$destroy", hideEditorPane);
           scope.onAppEvent('hide-dash-editor', hideEditorPane);
           scope.onAppEvent('show-dash-editor', showEditorPane);
         }

src/app/features/dashboard/dashboardCtrl.js

@@ -105,7 +105,7 @@ function (angular, $, config, _) {
     };
 
     $scope.checkFeatureToggles = function() {
-      $scope.submenuEnabled = $scope.dashboard.templating.enable || $scope.dashboard.annotations.enable;
+      $scope.submenuEnabled = $scope.dashboard.templating.enable || $scope.dashboard.annotations.enable || false;
     };
 
     $scope.onDrop = function(panelId, row, dropTarget) {

src/app/features/graphite/datasource.js

@@ -158,7 +158,6 @@ function (angular, _, $, config, kbn, moment) {
           date = date.replace('M', 'mon');
           return date;
         }
-
         date = kbn.parseDate(date);
       }
 

src/app/panels/graph/axisEditor.html

@@ -150,7 +150,7 @@
 				<li class="tight-form-item">
 					Show&nbsp;
 					<input class="cr1" id="panel.legend.show" type="checkbox"
-					ng-model="panel.legend.show" ng-checked="panel.legend.show" ng-change="render()">
+					ng-model="panel.legend.show" ng-checked="panel.legend.show" ng-change="get_data()">
 					<label for="panel.legend.show" class="cr1"></label>
 				</li>
 				<li class="tight-form-item">