openmct/platform
Victor Woeltjen 5e44bfc6c7 Merge branch 'master' into open671
Conflicts:
	main.js
	platform/commonUI/edit/src/policies/EditableMovePolicy.js
	platform/commonUI/general/src/directives/MCTTree.js
	platform/commonUI/general/src/ui/ToggleView.js
	platform/core/src/actions/ActionCapability.js
	platform/core/test/models/CachingModelDecoratorSpec.js
	platform/core/test/services/InstantiateSpec.js
	platform/features/events/bundle.js
	platform/features/events/src/DomainColumn.js
	platform/features/events/src/EventListController.js
	platform/features/events/src/EventListPopulator.js
	platform/features/events/src/RangeColumn.js
	platform/features/events/src/directives/MCTDataTable.js
	platform/features/events/src/policies/MessagesViewPolicy.js
	platform/features/events/test/DomainColumnSpec.js
	platform/features/events/test/EventListControllerSpec.js
	platform/features/events/test/EventListPopulatorSpec.js
	platform/features/events/test/RangeColumnSpec.js
	platform/features/events/test/policies/MessagesViewPolicySpec.js
	platform/features/rtevents/bundle.js
	platform/features/rtevents/src/DomainColumn.js
	platform/features/rtevents/src/RTEventListController.js
	platform/features/rtevents/src/RangeColumn.js
	platform/features/rtevents/src/directives/MCTRTDataTable.js
	platform/features/rtevents/src/policies/RTMessagesViewPolicy.js
	platform/features/rtevents/test/DomainColumnSpec.js
	platform/features/rtevents/test/RTEventListControllerSpec.js
	platform/features/rtevents/test/RangeColumnSpec.js
	platform/features/rtevents/test/policies/RTMessagesViewPolicySpec.js
	platform/features/rtscrolling/bundle.js
	platform/features/rtscrolling/src/DomainColumn.js
	platform/features/rtscrolling/src/NameColumn.js
	platform/features/rtscrolling/src/RTScrollingListController.js
	platform/features/rtscrolling/src/RangeColumn.js
	platform/features/scrolling/src/DomainColumn.js
	platform/features/scrolling/src/RangeColumn.js
	platform/features/scrolling/src/ScrollingListController.js
	platform/features/scrolling/src/ScrollingListPopulator.js
	platform/features/scrolling/test/DomainColumnSpec.js
	platform/features/scrolling/test/RangeColumnSpec.js
	platform/features/scrolling/test/ScrollingListControllerSpec.js
	platform/features/scrolling/test/ScrollingListPopulatorSpec.js
	platform/features/table/src/directives/MCTTable.js
	platform/features/table/test/controllers/TelemetryTableControllerSpec.js
	platform/representation/src/gestures/DropGesture.js
	platform/telemetry/src/TelemetryFormatter.js
	test-main.js
2016-04-08 16:08:19 -07:00
..
commonUI Merge branch 'master' into open671 2016-04-08 16:08:19 -07:00
containment [Build] Remove unused variables from specs 2016-03-04 12:56:14 -08:00
core Merge branch 'master' into open671 2016-04-08 16:08:19 -07:00
data [Structure] Add platform structure 2014-10-27 18:18:50 -07:00
entanglement Merge branch 'master' into open671 2016-04-08 16:08:19 -07:00
execution [Timelines] Remove unused TaskService 2016-03-07 15:30:57 -08:00
exporters [Build] Remove boilerplate from scripts 2016-03-04 10:46:38 -08:00
features Merge branch 'master' into open671 2016-04-08 16:08:19 -07:00
forms Merge branch 'master' into open671 2016-04-08 16:08:19 -07:00
framework [Build] Ignore apparent strict violation 2016-03-04 11:24:14 -08:00
identity [Build] Remove unused variables from specs 2016-03-04 12:56:14 -08:00
persistence [Build] Remove unused variables from specs 2016-03-04 12:56:14 -08:00
policy [Build] Remove unused variables from specs 2016-03-04 12:56:14 -08:00
representation Merge branch 'master' into open671 2016-04-08 16:08:19 -07:00
search Merge branch 'master' into open671 2016-04-08 16:08:19 -07:00
status [Build] Remove boilerplate from scripts 2016-03-04 10:46:38 -08:00
telemetry Merge branch 'master' into open671 2016-04-08 16:08:19 -07:00
README.md [Structure] Add platform structure 2014-10-27 18:18:50 -07:00

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