ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-24 07:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
264896c264
openmct/platform
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
..
commonUI Merge branch 'master' into persist-on-mutation-825 2016-05-20 14:26:39 -07:00
containment [Code Style] Run gulp fixstyle 2016-05-19 11:29:13 -07:00
core Merge branch 'master' into persist-on-mutation-825 2016-05-20 14:26:39 -07:00
data [Structure] Add platform structure 2014-10-27 18:18:50 -07:00
entanglement Merge branch 'master' into persist-on-mutation-825 2016-05-20 14:26:39 -07:00
execution [Timelines] Remove unused TaskService 2016-03-07 15:30:57 -08:00
exporters [Code Style] Run gulp fixstyle 2016-05-19 11:29:13 -07:00
features Merge branch 'master' into persist-on-mutation-825 2016-05-20 14:26:39 -07:00
forms [Code Style] Run gulp fixstyle 2016-05-19 11:29:13 -07:00
framework [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
identity [Code Style] Run gulp fixstyle 2016-05-19 11:29:13 -07:00
persistence [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
policy [Code Style] Run gulp fixstyle 2016-05-19 11:29:13 -07:00
representation Merge pull request #927 from nasa/jscs-rebase-142 2016-05-20 14:03:27 -07:00
search [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
status [Code Style] Run gulp fixstyle 2016-05-19 11:29:13 -07:00
telemetry [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
README.md [Structure] Add platform structure 2014-10-27 18:18:50 -07:00

README.md

This directory contains all bundles for the Open MCT Web platform, as well as the framework which runs them.