openmct

mirror of https://github.com/nasa/openmct.git synced 2025-03-10 22:43:55 +00:00

History

Victor Woeltjen 7fb45888d4 Merge branch 'master' into open313

Conflicts:
	platform/representation/test/MCTRepresentationSpec.js
	platform/representation/test/suite.json

2016-03-10 11:37:24 -08:00

commonUI

Merge branch 'master' into open313

2016-03-10 11:37:24 -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 #653 from nasa/open499

2016-03-01 14:50:56 -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

exporters

[CSV Export] Update JSDoc

2016-02-09 12:30:53 -08:00

features

Fixed issue with non-named columns

2016-03-03 10:12:25 -08:00

forms

[Templates] load plot templates with require

2016-03-01 10:52:07 -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

[Templates] Include templates using text plugin

2016-02-26 13:07:50 -08:00

policy

[Tests] Remove suite.json files

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

representation

Merge branch 'master' into open313

2016-03-10 11:37:24 -08:00

[Templates] Include templates using text plugin

2016-02-26 13:07: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.