openmct

mirror of https://github.com/nasa/openmct.git synced 2025-05-28 21:24:20 +00:00

History

Victor Woeltjen d3e274bfdd Merge branch 'master' into open401

Resolve conflicts for #416

Conflicts:
	platform/commonUI/browse/bundle.json
	platform/commonUI/browse/src/BrowseController.js

2016-02-22 14:27:21 -08:00

commonUI

Merge branch 'master' into open401

2016-02-22 14:27:21 -08:00

containment

[New Edit Mode] #659 Fix to prevent multi-composition with same object, fix to prevent composition of object with self

2016-02-10 16:43:08 -08:00

core

Merge pull request #642 from nasa/open460

2016-02-08 12:21:01 -08:00

data

[Structure] Add platform structure

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

entanglement

[Create] Clarify function naming

2016-02-11 09:49:26 -08:00

execution

[Tests] Remove suite.json files

2016-02-02 09:35:50 -08:00

features

[Build] Save stylesheets to proper location

2016-02-19 13:26:20 -08:00

forms

Merge pull request #642 from nasa/open460

2016-02-08 12:21:01 -08:00

framework

Merge pull request #642 from nasa/open460

2016-02-08 12:21:01 -08:00

identity

[Tests] Remove suite.json files

2016-02-02 09:35:50 -08:00

persistence

[Tests] Remove suite.json files

2016-02-02 09:35:50 -08:00

policy

[Tests] Remove suite.json files

2016-02-02 09:35:50 -08:00

representation

Merge pull request #642 from nasa/open460

2016-02-08 12:21:01 -08:00

[Tests] Remove suite.json files

2016-02-02 09:35:50 -08:00

status

[Tests] Remove suite.json files

2016-02-02 09:35:50 -08:00

telemetry

Merge pull request #642 from nasa/open460

2016-02-08 12:21:01 -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.