openmct

mirror of https://github.com/nasa/openmct.git synced 2025-05-31 14:40:48 +00:00

History

Victor Woeltjen 3c3dd0ad17 Merge branch 'open1035' into open-master

Merge WTD-1035; resolving conflicts to avoid WTD-1069

Conflicts:
	platform/commonUI/edit/src/controllers/EditController.js
	platform/commonUI/edit/src/objects/EditableDomainObjectCache.js

2015-04-06 08:32:54 -07:00

commonUI

Merge branch 'open1035' into open-master

2015-04-06 08:32:54 -07:00

core

[Core] Add test cases

2015-03-25 16:18:24 -07:00

data

[Structure] Add platform structure

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

features

[Frontend] Sanding and polishing on common front-end elements

2015-03-20 16:37:42 -07:00

forms

[Frontend] Sanding and polishing on common front-end elements

2015-03-20 16:37:42 -07:00

framework

Merge remote-tracking branch 'origin/open793' into open-master

2015-02-10 17:22:26 -08:00

identity

[Structure] Add platform structure

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

persistence

[Persistence] Update default ElasticSearch path

2015-03-25 16:43:56 -07:00

representation

Merge branch 'open988' into open-master

2015-03-25 16:57:05 -07:00

telemetry

[Telemetry] Update subscription spec

2015-02-19 09:11:59 -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.