openmct

mirror of https://github.com/nasa/openmct.git synced 2025-02-21 01:42:31 +00:00

History

Victor Woeltjen 264896c264 Merge branch 'master' into persist-on-mutation-825

Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/commonUI/edit/test/actions/RemoveActionSpec.js
	platform/entanglement/src/services/LinkService.js
	platform/features/timeline/src/controllers/drag/TimelineDragHandler.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDecorator.js
	platform/features/timeline/test/controllers/drag/TimelineDragHandlerSpec.js
	platform/features/timeline/test/controllers/swimlane/TimelineSwimlaneDropHandlerSpec.js

2016-05-20 14:26:39 -07:00

clock

Merge branch 'master' into persist-on-mutation-825

2016-05-20 14:26:39 -07:00

conductor

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

imagery

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

layout

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

pages

Merge branch 'master' into open671

2016-04-08 16:08:19 -07:00

plot

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

static-markup

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

table

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

timeline

Merge branch 'master' into persist-on-mutation-825

2016-05-20 14:26:39 -07:00

README.md

[Structure] Add platform structure

2014-10-27 18:18:50 -07:00

README.md

This directory contains bundles which represent specific user-facing features of Open MCT Web, such as plots and other visualizations. Bundles in this directory should be effectively optional.