6d2b2fd81e
[Time Controller] Parse user-entered timestamps
...
nasa/openmctweb#181 .
2015-10-21 14:46:12 -07:00
608800ae63
Merge remote-tracking branch 'github/master' into open181
...
Conflicts:
platform/commonUI/general/res/templates/controls/time-controller.html
2015-10-21 14:40:42 -07:00
07818b0a6d
[Time Controller] Show bounds in a text field
...
Show bounds in a text field to allow user editing; supports manual
editing of time controller bounds, nasa/openmctweb#181 .
2015-10-21 14:35:18 -07:00
fb0ce1eca8
[Frontend] New .loading class
...
open #190
Removed old .loading styles previously
commented out;
2015-10-19 11:13:50 -07:00
d7bd793bf3
[Frontend] New .loading class
...
open #190
CSS for revised .loading class;
Commented out/removed old .loading styles;
Theme constants for loading colors added
to theme files;
2015-10-15 16:23:42 -07:00
9cc0c0b06f
[Frontend] Polishing of styles for time-controller
...
open #179
open #180
Font-size normalized for time-controller and domain selector;
Layout of object-holder and time-controller fixed;
2015-10-14 10:25:05 -07:00
c703714cb3
Merge remote-tracking branch 'github-open/open115b' into open-master
2015-10-09 13:50:27 -07:00
b48a07cd3e
Merge pull request #168 from nasa/mct80
...
[Plot] Dates show 1970 when there is no data
2015-10-09 13:40:04 -07:00
8c29c8ed0e
Merge remote-tracking branch 'github-open/open151' into open-master
2015-10-09 13:38:20 -07:00
5763511ec8
[Time Conductor] Update specs
...
Update specs to reflect merge of latest from master into
topic branch for nasa/openmctweb#115 , domain selector.
2015-10-09 11:17:57 -07:00
2accf21518
[Time Conductor] Add missing semicolon
...
...to pass code style checks.
2015-10-09 11:08:02 -07:00
28c42fcd4c
[Time Conductor] Fix merge issues
...
Fix merge issues not addressed during conflict resolution.
2015-10-09 11:06:41 -07:00
1efa97e6f5
Merge remote-tracking branch 'github/master' into open115b
...
Conflicts:
platform/features/conductor/src/ConductorRepresenter.js
2015-10-09 10:32:43 -07:00
756f728865
Merge remote-tracking branch 'github/open1515' into open-master
2015-10-09 10:11:11 -07:00
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
fc0bfa77db
Merge remote-tracking branch 'github-open/open141' into open141-integration
2015-10-09 09:52:35 -07:00
12c6e53939
Merge remote-tracking branch 'github-open/open157' into open-master
2015-10-09 09:47:23 -07:00
4f716ad5c5
Merge pull request #162 from nasa/open117
...
Review and integrate open117
2015-10-09 09:44:48 -07:00
8093fcbda1
Merge remote-tracking branch 'github-open/open139c' into open-master
2015-10-09 09:42:22 -07:00
0ea5721f76
Merge remote-tracking branch 'github-open/open-readme-cairo' into open-master
2015-10-09 09:38:32 -07:00
d902943552
[Time Conductor] Satisfy JSLint
...
...in preparation to merge pull request nasa/openmctweb#162
2015-10-09 09:36:57 -07:00
5f7c8ccadb
Merge remote-tracking branch 'github/master' into open117b
2015-10-09 09:35:07 -07:00
520d17f9db
[Time Conductor] Test span constraints
...
Verify that inner and outer spans do not become zero when
user input might otherwise cause this.
2015-10-09 09:29:01 -07:00
7532db5f49
[Time Conductor] Add test cases
...
Add test cases to TimeRangeController; testing existing functionality
in the context of nasa/openmctweb#151
2015-10-09 07:58:10 -07:00
ebd8fdeee3
[Time Conductor] Enforce inner minimums on outer changes
2015-10-09 07:32:46 -07:00
f738f84075
[Time Conductor] Enforce minimum outer span
2015-10-08 16:02:47 -07:00
cc19a0acba
[Time Conductor] Enforce minimum inner span
...
nasa/openmctweb#151 .
2015-10-08 15:51:23 -07:00
134b749bbf
[Generic Search] Track pending indexes
...
Track domain objects which have indexing operations pending,
to avoid redundantly indexing in cases where a broader
indexed check is insufficient.
2015-10-05 10:11:38 -07:00
36d06e8b54
[Generic Search] Reduce flush interval
...
Per discussion from nasa/openmctweb#141 , minimize the
interval at which new objects get indexed, instead of
presuming requirements for CPU utilization.
2015-10-05 10:06:55 -07:00
5520d90984
[Generic Search] Remove comments
...
Per code review, nasa/openmctweb#165
2015-10-05 09:57:46 -07:00
77b0086d18
[Generic Search] Use appropriate data structure
...
Per code review, nasa/openmctweb#165
2015-10-05 09:54:57 -07:00
146e948097
[Time Conductor] Remove telemetry series wrapper
...
WTD-1515
2015-10-02 16:47:13 -07:00
669b434c36
[Time Conductor] Test broadcast throttling
2015-10-02 16:38:32 -07:00
431c74ca49
[Time Conductor] Only update bounds when stable
2015-10-02 16:28:58 -07:00
cd0c0f77cc
[Time Conductor] Throttle display bounds broadcasting
2015-10-02 16:20:31 -07:00
8cba321886
[Plot] Move throttling out of plot
...
Move throttling associated with display bounds changes out
of Plot.
2015-10-02 16:11:12 -07:00
dd83816035
[Time Conductor] Remove queryStart, queryEnd
...
...per feedback from code review, nasa/openmctweb#104
2015-10-02 16:08:44 -07:00
1ca2b769d9
[Common UI] Test popupService
2015-10-02 15:44:36 -07:00
a1d1261179
[Common UI] Test Popup
2015-10-02 14:58:20 -07:00
99048a4ee3
[Info Service] Update spec
...
...to reflect usage of popupService.
2015-10-02 14:49:27 -07:00
553b17fafe
[Common UI] Update mct-popup spec
...
...to reflect usage of popupService.
2015-10-02 14:36:04 -07:00
c4aff95341
[Common UI] Add empty specs for popupService
2015-10-02 14:15:31 -07:00
13095b4135
[Context Menu] Update specs
...
Update specs to reflect refactoring-out of popup elements
performed in the context of adding time conductor, WTD-1515.
2015-10-02 14:14:34 -07:00
fd927d4c03
Merge remote-tracking branch 'github/master' into open1515
2015-10-02 12:31:00 -07:00
445f22ccb0
[Context Menu] Use popupService to display menus
2015-10-02 11:01:49 -07:00
1ad0bf337c
[Common UI] Use popupService from mct-popup
2015-10-02 10:48:45 -07:00
73dc16d398
[Info Service] Render info bubble after positioning
...
Render info bubble after positioning with the popupService,
to apply arrow classes appropriately.
2015-10-02 10:21:42 -07:00
bebe53820f
[Info Service] Choose arrow direction
2015-10-02 09:36:27 -07:00
dfe909d6b5
[Time Conductor] Show appropriate arrow
...
...on info bubbles, when using bubbles shown via the
popupService.
2015-10-01 16:59:12 -07:00
3cf62ded08
Plot axes do not show labels when no data
...
Added semicolon
Added test for hasDomainData()
Added test for negative case on domain data check
Removed label test due to mocked telemetry formatter
Uncommented test commented by accident
Removed extra space
2015-10-01 16:35:14 -07:00
