Updated changelog with new display styles per series option feature, Closes #425, Closes #700

CHANGELOG.md

@@ -5,6 +5,7 @@
 - [Issue #578](https://github.com/grafana/grafana/issues/578). Dashboard: Row option to display row title even when the row is visible
 - [Issue #578](https://github.com/grafana/grafana/issues/578). Dashboard: Row option to display row title even when the row is visible
 - [Issue #672](https://github.com/grafana/grafana/issues/672). Dashboard: panel fullscreen & edit state is present in url, can now link to graph in edit & fullscreen mode.
 - [Issue #672](https://github.com/grafana/grafana/issues/672). Dashboard: panel fullscreen & edit state is present in url, can now link to graph in edit & fullscreen mode.
 - [Issue #709](https://github.com/grafana/grafana/issues/709). Dashboard: Small UI look polish to search results, made dashboard title link are larger
 - [Issue #709](https://github.com/grafana/grafana/issues/709). Dashboard: Small UI look polish to search results, made dashboard title link are larger
+- [Issue #425](https://github.com/grafana/grafana/issues/425). Graph: New section in 'Display Styles' tab to override any display setting on per series bases (mix and match lines, bars, points, fill, stack, line width etc)
 
 
 **Fixes**
 **Fixes**
 - [Issue #696](https://github.com/grafana/grafana/issues/696). Graph: Fix for y-axis format 'none' when values are in scientific notation (ex 2.3e-13)
 - [Issue #696](https://github.com/grafana/grafana/issues/696). Graph: Fix for y-axis format 'none' when values are in scientific notation (ex 2.3e-13)

src/app/components/kbn.js

@@ -231,36 +231,36 @@ function($, _, moment) {
         if (type === 0) {
         if (type === 0) {
           roundUp ? dateTime.endOf('year') : dateTime.startOf('year');
           roundUp ? dateTime.endOf('year') : dateTime.startOf('year');
         } else if (type === 1) {
         } else if (type === 1) {
-          dateTime.add('years',num);
+          dateTime.add(num, 'years');
         } else if (type === 2) {
         } else if (type === 2) {
-          dateTime.subtract('years',num);
+          dateTime.subtract(num, 'years');
         }
         }
         break;
         break;
       case 'M':
       case 'M':
         if (type === 0) {
         if (type === 0) {
           roundUp ? dateTime.endOf('month') : dateTime.startOf('month');
           roundUp ? dateTime.endOf('month') : dateTime.startOf('month');
         } else if (type === 1) {
         } else if (type === 1) {
-          dateTime.add('months',num);
+          dateTime.add(num, 'months');
         } else if (type === 2) {
         } else if (type === 2) {
-          dateTime.subtract('months',num);
+          dateTime.subtract(num, 'months');
         }
         }
         break;
         break;
       case 'w':
       case 'w':
         if (type === 0) {
         if (type === 0) {
           roundUp ? dateTime.endOf('week') : dateTime.startOf('week');
           roundUp ? dateTime.endOf('week') : dateTime.startOf('week');
         } else if (type === 1) {
         } else if (type === 1) {
-          dateTime.add('weeks',num);
+          dateTime.add(num, 'weeks');
         } else if (type === 2) {
         } else if (type === 2) {
-          dateTime.subtract('weeks',num);
+          dateTime.subtract(num, 'weeks');
         }
         }
         break;
         break;
       case 'd':
       case 'd':
         if (type === 0) {
         if (type === 0) {
           roundUp ? dateTime.endOf('day') : dateTime.startOf('day');
           roundUp ? dateTime.endOf('day') : dateTime.startOf('day');
         } else if (type === 1) {
         } else if (type === 1) {
-          dateTime.add('days',num);
+          dateTime.add(num, 'days');
         } else if (type === 2) {
         } else if (type === 2) {
-          dateTime.subtract('days',num);
+          dateTime.subtract(num, 'days');
         }
         }
         break;
         break;
       case 'h':
       case 'h':
@@ -268,27 +268,27 @@ function($, _, moment) {
         if (type === 0) {
         if (type === 0) {
           roundUp ? dateTime.endOf('hour') : dateTime.startOf('hour');
           roundUp ? dateTime.endOf('hour') : dateTime.startOf('hour');
         } else if (type === 1) {
         } else if (type === 1) {
-          dateTime.add('hours',num);
+          dateTime.add(num, 'hours');
         } else if (type === 2) {
         } else if (type === 2) {
-          dateTime.subtract('hours',num);
+          dateTime.subtract(num,'hours');
         }
         }
         break;
         break;
       case 'm':
       case 'm':
         if (type === 0) {
         if (type === 0) {
           roundUp ? dateTime.endOf('minute') : dateTime.startOf('minute');
           roundUp ? dateTime.endOf('minute') : dateTime.startOf('minute');
         } else if (type === 1) {
         } else if (type === 1) {
-          dateTime.add('minutes',num);
+          dateTime.add(num, 'minutes');
         } else if (type === 2) {
         } else if (type === 2) {
-          dateTime.subtract('minutes',num);
+          dateTime.subtract(num, 'minutes');
         }
         }
         break;
         break;
       case 's':
       case 's':
         if (type === 0) {
         if (type === 0) {
           roundUp ? dateTime.endOf('second') : dateTime.startOf('second');
           roundUp ? dateTime.endOf('second') : dateTime.startOf('second');
         } else if (type === 1) {
         } else if (type === 1) {
-          dateTime.add('seconds',num);
+          dateTime.add(num, 'seconds');
         } else if (type === 2) {
         } else if (type === 2) {
-          dateTime.subtract('seconds',num);
+          dateTime.subtract(num, 'seconds');
         }
         }
         break;
         break;
       default:
       default:

src/test/specs/helpers.js

@@ -64,7 +64,7 @@ define([
   function FilterSrvStub() {
   function FilterSrvStub() {
     this.time = { from:'now-1h', to: 'now'};
     this.time = { from:'now-1h', to: 'now'};
     this.timeRange = function(parse) {
     this.timeRange = function(parse) {
-      if (!parse) {
+      if (parse === false) {
         return this.time;
         return this.time;
       }
       }
       return {
       return {