openmct

mirror of https://github.com/nasa/openmct.git synced 2025-02-01 16:58:04 +00:00

History

Victor Woeltjen c6064dfe6c Merge branch 'open615' into open889

Merge in work-in-progress for WTD-615 (Fixed Position View)
into topic branch for WTD-889 (a sub-issue of WTD-615, which
has been broken down into discrete chunks to support
development.

Conflicts:
	platform/telemetry/src/TelemetrySubscription.js

2015-02-17 08:26:34 -08:00

res/templates

[Fixed Position] Allow views to populate toolbar

2015-01-15 17:04:03 -08:00

src

Merge branch 'open615' into open889

2015-02-17 08:26:34 -08:00

test

Merge remote-tracking branch 'origin/open723' into open-master

2015-02-03 17:26:53 -08:00

bundle.json

[Layout] Add commit to scope

2014-12-06 09:38:36 -08:00

README.md

[Common UI] Initial commonUI bundles

2014-11-23 15:41:20 -08:00

README.md

Contains sources and resources associated with Edit mode.