8 Commits

Author	SHA1	Message	Date
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
Victor Woeltjen	669b434c36	[Time Conductor] Test broadcast throttling	2015-10-02 16:38:32 -07:00
Victor Woeltjen	dd83816035	[Time Conductor] Remove queryStart, queryEnd ... ...per feedback from code review, nasa/openmctweb#104	2015-10-02 16:08:44 -07:00
Victor Woeltjen	cbaf45afe9	[Time Conductor] Update specs ... nasa/openmctweb#115	2015-09-25 10:40:19 -07:00
Victor Woeltjen	86bb89a162	[Time Controller] Update spec ... Update spec for ConductorRepresenter to reflect changes to model properties expected by TimeRangeController. WTD-1515	2015-09-10 11:31:40 -07:00
Victor Woeltjen	01a6d2e6a7	[Time Controller] Test ConductorRepresenter ... WTD-1515	2015-09-04 12:44:49 -07:00
Victor Woeltjen	af462ff3ee	[Time Controller] Begin adding mocks ... Begin adding/configuring mocks to support testing ConductorRepresenter, WTD-1515	2015-09-04 12:12:21 -07:00
Victor Woeltjen	35ff4efbca	[Time Conductor] Add placeholder specs ... Add empty specs for classes related to time conductor, WTD-1515	2015-09-04 09:44:08 -07:00