openmct/platform/features/layout/src
Victor Woeltjen 5ab2ceb333 Merge branch 'open940b' into open929
Merge in Fixed Position updates to reconcile conflicts
related to generalization of selection mechanism, WTD-929.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/test/FixedControllerSpec.js
2015-03-04 15:09:46 -08:00
..
elements Merge branch 'open940b' into open929 2015-03-04 15:09:46 -08:00
FixedController.js Merge branch 'open940b' into open929 2015-03-04 15:09:46 -08:00
FixedDragHandle.js [Frontend] In-progress checkin: migrating style tags to classes, other 2015-02-25 15:53:02 -08:00
FixedProxy.js [Fixed Position] Ensure default positions 2015-02-24 14:15:58 -08:00
LayoutController.js [Fixed Position] Add specs for drop 2015-02-17 10:50:02 -08:00
LayoutDrag.js [Layout] Add JSDoc to new scripts 2014-12-05 18:01:38 -08:00