openmct

mirror of https://github.com/nasa/openmct.git synced 2025-05-28 05:04:18 +00:00

History

Victor Woeltjen c6064dfe6c Merge branch 'open615' into open889

Merge in work-in-progress for WTD-615 (Fixed Position View)
into topic branch for WTD-889 (a sub-issue of WTD-615, which
has been broken down into discrete chunks to support
development.

Conflicts:
	platform/telemetry/src/TelemetrySubscription.js

2015-02-17 08:26:34 -08:00

commonUI

Merge branch 'open615' into open889

2015-02-17 08:26:34 -08:00

core

Merge remote-tracking branch 'origin/open660' into open-master

2015-02-04 16:31:27 -08:00

data

[Structure] Add platform structure

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

features

Merge branch 'open615' into open889

2015-02-17 08:26:34 -08:00

forms

[Forms] Handle disabled state generally

2015-01-15 15:46:25 -08:00

framework

Merge remote-tracking branch 'origin/open793' into open-master

2015-02-10 17:22:26 -08:00

identity

[Structure] Add platform structure

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

persistence

[Persistence] Add test case

2015-02-03 15:51:11 -08:00

representation

Merge remote-tracking branch 'origin/open719' into open-master

2015-02-04 11:00:47 -08:00

telemetry

Merge branch 'open615' into open889

2015-02-17 08:26:34 -08: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.