openmct

mirror of https://github.com/nasa/openmct.git synced 2025-01-31 08:25:31 +00:00

History

Victor Woeltjen 50bd233b0a Merge remote-tracking branch 'origin/master' into table-export-934

Conflicts:
	platform/commonUI/general/res/sass/controls/_buttons.scss
	platform/features/table/res/templates/mct-table.html

2016-06-15 10:05:20 -07:00

clock

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

conductor

[Edit Mode] #629 rewriting disabled tests

2016-05-26 11:38:12 -07:00

imagery

[Frontend] Styling Export button

2016-05-31 11:40:31 -07:00

layout

[New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController

2016-05-20 14:12:24 -07:00

pages

Merge branch 'master' into open671

2016-04-08 16:08:19 -07:00

plot

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

static-markup

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

table

Merge remote-tracking branch 'origin/master' into table-export-934

2016-06-15 10:05:20 -07:00

timeline

Merge remote-tracking branch 'origin/timeline-console-error-978'

2016-06-14 10:41:26 -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.