openmct

mirror of https://github.com/nasa/openmct.git synced 2025-04-19 08:36:24 +00:00

History

Charles Hacskaylo 6868bfd4e1 [Merge] Resolve conflicts in open155

open #155

Conflicts:
	platform/commonUI/general/res/sass/user-environ/_layout.scss
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/commonUI/themes/snow/res/sass/_constants.scss

2015-10-26 13:20:26 -07:00

conductor

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

events

[Code Style] Use prototypes for Events bundle

2015-08-11 16:01:16 -07:00

imagery

[Frontend] Significant re-factoring of CSS and markup

2015-09-02 18:02:58 -07:00

layout

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

pages

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

plot

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

rtevents

[JSDoc] Add annotations

2015-08-07 11:44:54 -07:00

rtscrolling

[JSDoc] Add annotations

2015-08-07 11:44:54 -07:00

scrolling

[Merge] Resolve conflicts in open155

2015-10-26 13:20:26 -07:00

static-markup

[Frontend] Remove static-markup file

2015-06-18 10:09:17 -07:00

README.md

[Structure] Add platform structure

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

README.md

This directory contains bundles which represent specific user-facing features of Open MCT Web, such as plots and other visualizations. Bundles in this directory should be effectively optional.