openmct

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

History

Victor Woeltjen 7974ffdda2 Merge remote-tracking branch 'github/master' into open245b

...in preparation to complete merge nasa/openmctweb#257

Conflicts:
	platform/entanglement/src/actions/CopyAction.js
	platform/entanglement/src/actions/LinkAction.js
	platform/entanglement/src/actions/MoveAction.js

2015-11-21 07:05:51 -08:00

commonUI

Merge pull request #321 from nasa/open169

2015-11-20 17:13:39 -08:00

containment

[Code Style] Satisfy JSLint

2015-08-11 13:03:06 -07:00

core

Merge remote-tracking branch 'github/master' into open245b

2015-11-21 07:05:51 -08:00

data

[Structure] Add platform structure

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

entanglement

Merge remote-tracking branch 'github/master' into open245b

2015-11-21 07:05:51 -08:00

execution

[Workers] Update JSDoc

2015-11-20 11:12:29 -08:00

features

[Frontend] Markup and CSS fixes

2015-11-19 18:50:10 -08:00

forms

[Frontend] Time Controller Markup and Styling

2015-09-24 15:38:52 -07:00

framework

[Framework] Update spec

2015-09-18 15:10:21 -07:00

identity

[Identity] Provide an undefined identity

2015-09-04 12:17:02 -07:00

persistence

[Persistence] Fix grammar in JSDoc

2015-11-21 06:59:12 -08:00

policy

[Code Style] Use prototypes in policy bundle

2015-08-14 15:49:47 -07:00

representation

[Frontend] Safety merge of master; minor fixes

2015-10-30 17:09:04 -07:00

[Code style] Cleaned out comments

2015-11-10 15:12:09 -08:00

status

[Status] Revise API

2015-11-20 09:46:08 -08:00

telemetry

[Telemetry] Add missing JSDoc

2015-11-18 10:50:32 -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.