openmct

mirror of https://github.com/nasa/openmct.git synced 2025-02-20 17:33:23 +00:00

History

Victor Woeltjen bce5643994 Merge branch 'master' into jscs-rebase-142

Conflicts:
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/representation/src/MCTRepresentation.js

2016-05-20 13:07:58 -07:00

commonUI

Merge branch 'master' into jscs-rebase-142

2016-05-20 13:07:58 -07:00

containment

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

core

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

data

…

entanglement

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

execution

[Timelines] Remove unused TaskService

2016-03-07 15:30:57 -08:00

exporters

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

features

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

forms

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

framework

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

identity

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

persistence

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

policy

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

representation

Merge branch 'master' into jscs-rebase-142

2016-05-20 13:07:58 -07:00

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

status

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

telemetry

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

README.md

…

README.md

This directory contains all bundles for the Open MCT Web platform, as well as the framework which runs them.