openmct

Files

Victor Woeltjen 0036974c60 Merge remote-tracking branch 'github/master' into open450b

Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json

2016-01-08 15:36:10 -08:00

clock

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

2016-01-08 15:36:10 -08:00

conductor

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

events

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

imagery

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

layout

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

2016-01-08 15:36:10 -08:00

pages

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

plot

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

2016-01-08 15:36:10 -08:00

rtevents

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

rtscrolling

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

scrolling

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

2016-01-08 15:36:10 -08:00

static-markup

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08:00

timeline

[API Refactor] Remove bundle.json files

2016-01-08 15:32:18 -08: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.