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
d8276c532b
openmct/platform
History
Victor Woeltjen d8276c532b Merge remote-tracking branch 'github/master' into open115b 
Merge in latest from master into topic branch for
nasa/openmctweb#115

Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
	platform/features/conductor/src/ConductorTelemetrySeries.js
	platform/features/conductor/src/TimeConductor.js
	platform/features/conductor/test/ConductorRepresenterSpec.js
	platform/features/conductor/test/ConductorTelemetrySeriesSpec.js
2015-10-09 10:04:15 -07:00
..
commonUI Merge remote-tracking branch 'github/master' into open115b 2015-10-09 10:04:15 -07:00
containment [Code Style] Satisfy JSLint 2015-08-11 13:03:06 -07:00
core Merge remote-tracking branch 'github-open/open139c' into open-master 2015-10-09 09:42:22 -07:00
data [Structure] Add platform structure 2014-10-27 18:18:50 -07:00
entanglement Merge remote-tracking branch 'github-open/open97' into open-master 2015-09-23 13:44:48 -07:00
execution [Code Style] Use prototypes for execution bundle 2015-08-11 15:02:52 -07:00
features Merge remote-tracking branch 'github/master' into open115b 2015-10-09 10:04:15 -07:00
forms [Frontend] Time Controller Markup and Styling 2015-09-24 15:38:52 -07:00
framework [Framework] Update spec 2015-09-18 15:10:21 -07:00
identity [Identity] Provide an undefined identity 2015-09-04 12:17:02 -07:00
persistence [Persistence] Add local storage indicator 2015-09-11 14:48:17 -07:00
policy [Code Style] Use prototypes in policy bundle 2015-08-14 15:49:47 -07:00
representation [Context Menu] Update specs 2015-10-02 14:14:34 -07:00
search [Frontend] Significant re-factoring of CSS and markup 2015-09-02 18:02:58 -07:00
telemetry [Time Conductor] Avoid exception 2015-09-25 11:05:18 -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.