openmct

mirror of https://github.com/nasa/openmct.git synced 2025-05-28 13:14:20 +00:00

History

Victor Woeltjen e3208187bf Merge branch 'master' into persist-on-mutation-825

Conflicts:
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js

2016-05-20 10:59:54 -07:00

commonUI

Merge branch 'master' into persist-on-mutation-825

2016-05-20 10:59:54 -07:00

containment

[Build] Remove unused variables from specs

2016-03-04 12:56:14 -08:00

core

[Persistence] Satisfy JSHint

2016-05-19 12:17:20 -07:00

data

[Structure] Add platform structure

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

entanglement

[Persistence] Don't expect persist calls in LocationCapability spec

2016-05-19 11:55:05 -07:00

execution

[Timelines] Remove unused TaskService

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

exporters

[Build] Remove boilerplate from scripts

2016-03-04 10:46:38 -08:00

features

[Persistence] Satisfy JSHint

2016-05-19 12:17:20 -07:00

forms

Merge branch 'master' into open671

2016-04-08 16:08:19 -07:00

framework

[Build] Satisfy JSHint

2016-04-08 16:22:40 -07:00

identity

[Build] Remove unused variables from specs

2016-03-04 12:56:14 -08:00

persistence

Merge branch 'master' into open671

2016-05-09 10:19:24 -07:00

policy

[Build] Remove unused variables from specs

2016-03-04 12:56:14 -08:00

representation

[New Edit Mode] #634 Removed edit concerns from MctRepresentation

2016-05-19 17:09:56 -07:00

Resolved merge conflicts

2016-05-12 16:14:31 -07:00

status

[Build] Remove boilerplate from scripts

2016-03-04 10:46:38 -08:00

telemetry

Merge branch 'master' into open671

2016-04-08 16:08:19 -07: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.