Victor Woeltjen a49deb5ab1 Merge remote-tracking branch 'github/master' into open116 ...

Merge in latest from master into topic branch for
https://github.com/nasa/openmctweb/issues/116

Conflicts:
	platform/features/layout/test/FixedControllerSpec.js
	platform/features/plot/test/PlotControllerSpec.js

2015-12-30 10:15:05 -08:00

..

elements

[Limits] Test PlotLimitTracker

2015-12-07 12:58:56 -08:00

modes

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

policies

[Plot] Test plot view policy

2015-06-18 17:11:11 -07:00

Canvas2DChartSpec.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

GLChartSpec.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

MCTChartSpec.js

[Performance] Update mct-chart spec

2015-12-03 13:39:37 -08:00

PlotControllerSpec.js

Merge remote-tracking branch 'github/master' into open116

2015-12-30 10:15:05 -08:00

SubPlotFactorySpec.js

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

SubPlotSpec.js

Plot axes do not show labels when no data

2015-10-01 16:35:14 -07:00

suite.json

[Limits] Test PlotLimitTracker

2015-12-07 12:58:56 -08:00