valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-07 09:28:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge conflict fix & bump version

Browse Source
This commit is contained in:
Arik Fraimovich 2014-03-03 20:27:04 +02:00
parent 3f79189410
commit 5d19096e0c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rd_ui/app/scripts/ng-highchart.js
View File

@ -211,7 +211,7 @@
};
if (scope.series.length > 0 && _.some(scope.series[0].data, function (p) {
return angular.isString(p.x)
return angular.isString(p.x) || angular.isDefined(p.name));
})) {
scope.chart.xAxis[0].update({type: 'category'});

2
redash/__init__.py
View File

@ -8,7 +8,7 @@ import redis
from statsd import StatsClient
from redash import settings, utils
__version__ = '0.3.3'
__version__ = '0.3.5'
app = Flask(__name__,
template_folder=settings.STATIC_ASSETS_PATH,