ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 01:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
d8276c532b
openmct/platform/features/conductor
History
Victor Woeltjen d8276c532b Merge remote-tracking branch 'github/master' into open115b 
Merge in latest from master into topic branch for
nasa/openmctweb#115

Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
	platform/features/conductor/src/ConductorTelemetrySeries.js
	platform/features/conductor/src/TimeConductor.js
	platform/features/conductor/test/ConductorRepresenterSpec.js
	platform/features/conductor/test/ConductorTelemetrySeriesSpec.js
2015-10-09 10:04:15 -07:00
..
res/templates [Time Conductor] Position domain selector 2015-09-25 16:06:11 -07:00
src Merge remote-tracking branch 'github/master' into open115b 2015-10-09 10:04:15 -07:00
test Merge remote-tracking branch 'github/master' into open115b 2015-10-09 10:04:15 -07:00
bundle.json Merge remote-tracking branch 'github/master' into open115b 2015-10-09 10:04:15 -07:00
README.md [Time Conductor] Add terminology note to readme 2015-09-04 10:24:18 -07:00

README.md

Provides the time conductor, a control which appears at the bottom of the screen allowing telemetry start and end times to be modified.

Note that the term "time controller" is generally preferred outside of the code base (e.g. in UI documents, issues, etc.); the term "time conductor" is being used in code to avoid confusion with "controllers" in the Model-View-Controller sense.