openmct

mirror of https://github.com/nasa/openmct.git synced 2025-01-27 06:39:21 +00:00

History

Victor Woeltjen ab01f64cea Merge remote-tracking branch 'github/master' into open236

Resolve CSS conflicts for nasa/openmctweb#236

Conflicts:
	platform/commonUI/general/res/sass/controls/_controls.scss
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css

2015-11-04 13:02:17 -08:00

commonUI

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

2015-11-04 13:02:17 -08:00

containment

[Code Style] Satisfy JSLint

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

core

Merge remote-tracking branch 'github-open/open141' into open141-integration

2015-10-09 09:52:35 -07:00

data

[Structure] Add platform structure

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

entanglement

Merging in latest github/master

2015-10-27 17:17:10 -07:00

execution

[Code Style] Use prototypes for execution bundle

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

features

[Time Conductor] Remove check for domain existence

2015-11-02 12:31:40 -08:00

forms

[Frontend] Time Controller Markup and Styling

2015-09-24 15:38:52 -07:00

framework

[Framework] Update spec

2015-09-18 15:10:21 -07:00

identity

[Identity] Provide an undefined identity

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

persistence

Merging in latest github/master

2015-10-27 17:17:10 -07:00

policy

[Code Style] Use prototypes in policy bundle

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

representation

[Frontend] Safety merge of master; minor fixes

2015-10-30 17:09:04 -07:00

[Search] Declare UI components as templates

2015-11-02 14:07:22 -08:00

telemetry

[Time Conductor] Update formatService usages

2015-11-02 12:28:46 -08: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.