openmct

mirror of https://github.com/nasa/openmct.git synced 2025-03-22 12:05:19 +00:00

History

Victor Woeltjen 98caa31d7b Merge branch 'open877' into open879

Merge fixed position view work and general toolbar
work to begin adding toolbars for fixed position view,
WTD-879."

Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html

2015-02-17 15:58:36 -08:00

commonUI

Merge branch 'open877' into open879

2015-02-17 15:58:36 -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

[Fixed Position] Add specs for drop

2015-02-17 10:50:02 -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

[Representation] Update docs

2015-02-17 10:56:38 -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.