Victor Woeltjen dbf196e014 Merge remote-tracking branch 'github/master' into open477 ... Resolve conflicts to complete merge of #477 Conflicts: platform/commonUI/general/bundle.json platform/commonUI/themes/espresso/res/css/theme-espresso.css platform/commonUI/themes/snow/res/css/theme-snow.css		2016-01-27 12:53:46 -08:00
..
controllers	Merge pull request #475 from nasa/open325b	2016-01-27 12:44:14 -08:00
directives	Merge pull request #451 from nasa/open116	2016-01-06 13:26:33 -08:00
filters	[Plot] Test reverse filter	2016-01-15 13:13:08 -08:00
services	[Time Conductor] Remove dateService	2015-10-22 16:27:21 -07:00
StyleSheetLoaderSpec.js	[Themes] Add missing semicolon	2015-11-04 11:54:19 -08:00
suite.json	[Plot] Test reverse filter	2016-01-15 13:13:08 -08:00
UnsupportedBrowserWarningSpec.js	[Common UI] Add spec for unsupported browser warning	2015-12-04 15:11:40 -08:00