openmct

mirror of https://github.com/nasa/openmct.git synced 2025-05-28 05:04:18 +00:00

History

Charles Hacskaylo 69f4b4975e Merge branch 'open-master' into open1170b

Conflicts:
	platform/commonUI/general/res/sass/plots.scss
	platform/commonUI/inspect/src/InfoConstants.js
	platform/features/imagery/src/policies/ImageryViewPolicy.js
	platform/features/static-markup/res/markup.html

2015-06-18 09:55:26 -07:00

commonUI

[Frontend] Manual update of platform css, fonts and sass only from open-master

2015-06-18 09:46:54 -07:00

containment

[Composition] Disallow composition for leaf types

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

core

[Info Bubble] Add newlines

2015-06-10 16:40:22 -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

features

Merge branch 'open-master' into open1170b

2015-06-18 09:55:26 -07:00

forms

Merge in open-master, resolve conflicts

2015-06-16 13:53:00 -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

Merge branch 'open-master' into open1199

2015-06-04 10:40:34 -07:00

policy

[Licenses] Add license headers

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

representation

[Licenses] Add license headers

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

telemetry

[Info Bubble] Change moment import

2015-06-04 12:32:37 -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.