openmct

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

History

Victor Woeltjen 5ab2ceb333 Merge branch 'open940b' into open929

Merge in Fixed Position updates to reconcile conflicts
related to generalization of selection mechanism, WTD-929.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/test/FixedControllerSpec.js

2015-03-04 15:09:46 -08:00

commonUI

Merge branch 'open940b' into open929

2015-03-04 15:09:46 -08:00

core

[About] Change version text

2015-02-12 16:51:24 -08:00

data

[Structure] Add platform structure

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

features

Merge branch 'open940b' into open929

2015-03-04 15:09:46 -08:00

forms

[Frontend] Tweaks and minor mods

2015-03-04 14:45:24 -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

[Tests] Add tests for persistence cache

2015-02-12 16:34:19 -08:00

representation

[Fixed Position] Update drop gesture spec

2015-02-19 12:34:22 -08:00

telemetry

[Telemetry] Update subscription spec

2015-02-19 09:11:59 -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.