openmct

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

History

Victor Woeltjen 9435e75461 Merge remote-tracking branch 'slhale/open33' into open47b

Fix merge conflict in preparation to integrate nasa/openmctweb#47

Conflicts:
	platform/commonUI/browse/res/templates/browse/object-header.html

2015-07-24 13:46:37 -07:00

commonUI

Merge remote-tracking branch 'slhale/open33' into open47b

2015-07-24 13:46:37 -07:00

containment

[Composition] Disallow composition for leaf types

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

core

Merge remote-tracking branch 'origin/open1223' into open-1338

2015-06-29 12:08:16 -07:00

data

[Structure] Add platform structure

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

entanglement

[Glyphs] Use placeholder glyphs for actions

2015-06-12 10:27:35 -07:00

execution

[Workers] Add example worker

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

features

[Plot] Don't allocate charts for empty plots

2015-07-17 09:13:20 -07:00

forms

Merge branch 'open-master' into open1272

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

framework

[Licenses] Add missing copyright/license info

2015-05-29 10:05:59 -07:00

identity

[Structure] Add platform structure

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

persistence

[Drag-Drop] Prevent redundant drops

2015-06-25 11:27:58 -07:00

policy

[Licenses] Add license headers

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

representation

[Browse] Update tests

2015-07-14 13:53:00 -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.