openmct

mirror of https://github.com/nasa/openmct.git synced 2025-03-11 23:14:16 +00:00

History

Victor Woeltjen 99376391a9 Merge remote-tracking branch 'github/master' into open229b

Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js

2015-11-03 16:58:40 -08:00

commonUI

Merge remote-tracking branch 'github-open/open182' into open-master

2015-11-03 15:52:14 -08:00

containment

[Code Style] Satisfy JSLint

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

core

Merge remote-tracking branch 'github-open/open141' into open141-integration

2015-10-09 09:52:35 -07:00

data

[Structure] Add platform structure

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

entanglement

[Entanglement] Add license headers

2015-10-19 12:08:49 -07:00

execution

[Code Style] Use prototypes for execution bundle

2015-08-11 15:02:52 -07:00

features

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

2015-11-03 16:58:40 -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

[Search] Add spec for ElasticSearchProvider

2015-10-20 16:01:42 -07:00

policy

[Code Style] Use prototypes in policy bundle

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

representation

[Representation] Update compilation approach

2015-10-30 16:37:47 -07:00

[Search] Declare UI components as templates

2015-11-02 14:07:22 -08:00

telemetry

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

2015-11-03 16:58:40 -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.