openmct

mirror of https://github.com/nasa/openmct.git synced 2025-04-11 13:20:18 +00:00

History

Victor Woeltjen de6dfe1fdc Merge remote-tracking branch 'github/master' into mobile

Merge in latest from master into mobile branch
to reconcile conflicts

Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js

2015-09-10 15:01:38 -07:00

commonUI

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

2015-09-10 15:01:38 -07:00

containment

[Code Style] Satisfy JSLint

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

core

Merge remote-tracking branch 'upstream/master' into mobile

2015-09-01 14:50:45 -07:00

data

…

entanglement

[Entanglement] Separate out location

2015-09-01 10:57:56 -07:00

execution

[Code Style] Use prototypes for execution bundle

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

features

[Frontend] CSS and markup tweaks to enable flex layout

2015-08-31 12:34:34 -07:00

forms

[Code Style] Use prototypes in forms bundle

2015-08-14 13:44:08 -07:00

framework

[Framework] Bump angular to 1.4.4

2015-08-24 12:39:48 -07:00

identity

[Identity] Provide an undefined identity

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

persistence

[Elastic] Elastic Bundle

2015-08-27 09:11:20 -07:00

policy

[Code Style] Use prototypes in policy bundle

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

representation

[Mobile] Clean Up

2015-08-27 12:06:25 -07:00

Merge branch 'master' of https://github.com/nasa/openmctweb into search

2015-08-24 13:14:43 -07:00

telemetry

[Code Style] Use prototypes in telemetry bundle

2015-08-14 16:55:17 -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.