Merge remote-tracking branch 'nasa/open1223' into open1223

Conflicts:
	platform/features/plot/res/templates/plot.html
This commit is contained in:
Victor Woeltjen 2015-06-19 14:50:00 -07:00
commit 4bc41e8aab

View File

@ -77,8 +77,8 @@
<!-- Out-of-bounds data indicators -->
<!-- ng-show is temporarily hard-coded in next element -->
<div ng-show="1" class="l-oob-data l-oob-data-up"></div>
<div ng-show="1" class="l-oob-data l-oob-data-dwn"></div>
<div ng-show="false" class="l-oob-data l-oob-data-up"></div>
<div ng-show="false" class="l-oob-data l-oob-data-dwn"></div>
<div class="gl-plot-hash hash-v"
ng-repeat="tick in subplot.getDomainTicks()"