Victor Woeltjen d3e274bfdd Merge branch 'master' into open401 ...

Resolve conflicts for #416

Conflicts:
	platform/commonUI/browse/bundle.json
	platform/commonUI/browse/src/BrowseController.js

2016-02-22 14:27:21 -08:00

..

creation

Merge pull request #500 from nasa/open480

2016-02-08 11:59:54 -08:00

navigation

Merge branch 'open1200' into open-1201

2015-06-08 11:11:50 -07:00

windowing

[Windowing] Unit Test

2015-06-25 10:10:13 -07:00

BrowseControllerSpec.js

Merge branch 'master' into open401

2016-02-22 14:27:21 -08:00

BrowseObjectControllerSpec.js

[Addressability} Unit Test

2015-06-26 12:51:25 -07:00

MenuArrowControllerSpec.js

[Browse] Tests completed

2015-07-07 09:28:01 -07:00

PaneControllerSpec.js

Fixed missing window reference causing test to fail

2015-11-03 16:45:11 -08:00