openmct

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

History

Victor Woeltjen a4a9acd2ea Merge branch 'open-master' into open-965

Merge in latest into topic branch for WTD-965 to
resolve conflicts.

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css

2015-08-19 14:16:56 -07:00

commonUI

Merge branch 'open-master' into open-965

2015-08-19 14:16:56 -07:00

containment

[Composition] Disallow composition for leaf types

2015-06-04 09:16:12 -07:00

core

[Style] Brace after if criteria

2015-08-19 13:55:02 -07:00

data

[Structure] Add platform structure

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

entanglement

[Move] correct logic and specification

2015-08-19 13:16:36 -07:00

execution

[Workers] Add example worker

2015-06-18 11:21:00 -07:00

features

[Layout] Use consistent whitespace

2015-08-04 10:00:44 -07:00

forms

Merge branch 'open-master' into open1272

2015-06-19 13:16:33 -07:00

framework

Revert "[Build] Bump PhantomJS Version"

2015-08-06 16:53:42 -07:00

identity

[Structure] Add platform structure

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

persistence

[Search] Input checks

2015-08-11 13:52:23 -07:00

policy

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

representation

[Menu] Listen to element directly

2015-08-07 14:39:59 -07:00

[Search] Remove unused dependency

2015-08-17 10:45:02 -07:00

telemetry

[Telemetry] Provide empty series

2015-07-14 15:51:13 -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.