ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-23 04:48:12 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
2,696 Commits 993 Branches 212 Tags 192 MiB
f7839b758d
Commit Graph

2401 Commits

Author SHA1 Message Date
Victor Woeltjen
920c83771d [Time Conductor] Update spec 
...for TimeRangeController to reflect separation of date-time
inputs into a separate control.

Additionally, removed unused function.
 2015-10-27 14:06:02 -07:00
Victor Woeltjen
cc8a7e513f [Time Conductor] Rename bundle 
Rename platform/time to platform/commonUI/formatting; nothing
particularly specific to time about these interfaces, and
removal of non-formatting-related methods makes this essentially
a UI concern.
 2015-10-27 13:11:04 -07:00
Victor Woeltjen
9dce3a04cc [Time Conductor] Remove obsolete code 
Remove code related to handling text input from TimeRangeController;
moved into DateTimeFieldController.
 2015-10-27 13:07:58 -07:00
Victor Woeltjen
18cdaf1b53 [Time Conductor] Fix extension definition 
For date time field controller; refer to correct implementation.
 2015-10-27 13:03:04 -07:00
Victor Woeltjen
e5d4376f06 [Time Conductor] Use date time field 
...from template for time controller.
 2015-10-27 13:01:27 -07:00
Victor Woeltjen
6784c6567b [Time Conductor] Add date-time field 
Add mct-control which includes both the date-time picker and
its corresponding text entry area, per code review feedback
from nasa/openmctweb#204.
 2015-10-27 13:00:42 -07:00
Victor Woeltjen
71618ce4b9 [Time Conductor] Hide date-picker for non-UTC formats 2015-10-27 12:40:14 -07:00
Victor Woeltjen
e5ebbdaf7f [Time Conductor] Use domain formats in scrolling list 2015-10-27 12:37:53 -07:00
Victor Woeltjen
9723c65016 [Time Conductor] Retain domain selection in plot 
Avoid various cases where domain selection is temporarily
overwritten due to transient plot state (e.g. because no
telemetry metadata is yet available due to asynchronous
retrieval of delegates.)
 2015-10-27 12:09:54 -07:00
Charles Hacskaylo
5d5425db04 [Frontend] Finessing and verifying CSS 
vista#54
Verified against fixed position and scrolling views
using SineWave generator;
font-size of glyph tweaked;
 2015-10-27 11:50:16 -07:00
Victor Woeltjen
7bd0e279b0 Merge remote-tracking branch 'github/master' into open182 
Merge latest from master branch into topic branch for
nasa/openmctweb#182
 2015-10-27 11:49:36 -07:00
Victor Woeltjen
caee1f520f [Time Conductor] Remove unused watches from plot 2015-10-27 11:46:41 -07:00
Charles Hacskaylo
a8856c0612 [Frontend] Platform-specific mods to limits 
vista#54
Refactor limits into multiple classes, separating
upr/lwr from red/yellow;
Modded SineWaveLimitCapability accordingly;
Normalized upr/lwr glyphs;
(cherry picked from commit a26d71b)
 2015-10-27 11:43:28 -07:00
Victor Woeltjen
b375ede217 [Time Conductor] Recognize domain changes in plot 2015-10-27 11:39:23 -07:00
Victor Woeltjen
0bd1d53d25 [Time Conductor] Update plot to support different formats 
...for telemetry domain values.
 2015-10-27 11:22:19 -07:00
Victor Woeltjen
3fe386fcd6 [Time Conductor] Use formatService from telemetryFormatter 2015-10-27 11:21:44 -07:00
akhenry
74f289cb34 Merge pull request #206 from nasa/open150b 
[Plot] Ignore empty lines
 2015-10-27 10:48:33 -07:00
Victor Woeltjen
82b321b3f9 [Time Conductor] Update displayed text when format changes 2015-10-27 10:28:32 -07:00
Victor Woeltjen
2056f3aed0 [Time Conductor] Update property name 
Renamed system to format per code review feedback,
nasa/openmctweb#204
 2015-10-27 10:00:35 -07:00
Victor Woeltjen
c6b7121cf0 [Time Conductor] Expose getFormat correctly 
...as an instance method of FormatProvider
 2015-10-27 09:45:17 -07:00
Victor Woeltjen
86c61f7543 [Time Conductor] Fix extension definition 
...for FormatProvider. Depends should be an array.
 2015-10-27 09:41:32 -07:00
Charles Hacskaylo
daed6a5b06 Frontend] Tweaked sizes of mini-tabs and pane collapsed edge margin 
open #90
 2015-10-26 15:01:32 -07:00
Charles Hacskaylo
498f854bef Frontend] Treeview expand/collapse anim timing tweaks 
open #90
 2015-10-26 14:54:09 -07:00
Charles Hacskaylo
77a1a90905 Frontend] Normalizing styles for items and l-icon-link 
open #90
 2015-10-26 14:48:50 -07:00
Charles Hacskaylo
f655346f46 Frontend] More refining of collapsing treeview 
open #90
Treeview and Inspector should be hidden by default
when opening in a new tab;
 2015-10-26 12:19:37 -07:00
Charles Hacskaylo
7d42292184 Frontend] More refining of collapsing treeview 
open #90
Treeview and search now transition properly when user collapses
left pane while searching;
 2015-10-26 10:35:41 -07:00
Victor Woeltjen
aa23d358cc [Time Conductor] Use formatService instead of timeService 2015-10-26 10:03:49 -07:00
Charles Hacskaylo
fd582d45d2 Frontend] More refining of collapsing treeview 
open #90
Create and Search controls now properly change
to mini-tabs when treeview is collapsed;
Mods to .create-btn to use :before for symbol instead of span;
 TO-DO: why does mct-device alter the order of items in the rendered
 markup?
 2015-10-26 10:01:52 -07:00
Victor Woeltjen
0f34d38451 [Time Conductor] Remove obsolete formatting classes 2015-10-26 09:57:14 -07:00
Victor Woeltjen
f8ee244475 [Time Conductor] Expose FormatProvider 2015-10-26 09:56:37 -07:00
Victor Woeltjen
322d1c8389 [Time Conductor] Add formatProvider 
...to handle lookup of extensions of category 'formats'
 2015-10-26 09:54:57 -07:00
Victor Woeltjen
c45bf45475 [Time Conductor] Remove non-format-like methods 
...from UTCTimeSystem, and rename to UTCTimeFormat. Per code
review feedback from nasa/openmctweb#182.
 2015-10-26 09:48:54 -07:00
Charles Hacskaylo
8ee4fc9b71 [Frontend] Fixed spacing of panes and mini-tabs 
open #90
Splitter spacing now being handled in CSS, so
modded calcs in MCTSplitPane to not add space;
CSS calcs adjusted; comments removed;
 2015-10-24 18:43:13 -07:00
Charles Hacskaylo
99c977ce9d [Frontend] Fixed mini-tab positioning algorithm 
open #90
 2015-10-24 17:48:59 -07:00
Charles Hacskaylo
85809ae1e1 [Frontend] Fixed mini-tab positioning algorithm 
open #90
 2015-10-24 17:01:52 -07:00
Victor Woeltjen
4ec243c6fb Merge pull request #212 from nasa/open211 
[RequireJS] Specify path for uuid
 2015-10-24 07:48:45 -07:00
Charles Hacskaylo
94649b12fd [Frontend] Splitter re-styling 
open #90
Significant redo of splitter styling;
 2015-10-23 20:06:38 -07:00
Charles Hacskaylo
aa3cf70b22 [Frontend] Expand/collapse styling 
open #90
Significant styling on new mini-tabs;
Main layout margins adjusted;
 2015-10-23 18:24:55 -07:00
akhenry
099d70b8d9 Merge pull request #175 from nasa/open147 
[Entanglement] Add "Go To Original" action
 2015-10-23 17:00:46 -07:00
Pete Richards
3d996ac466 [RequireJS] Specify path for uuid 
Specify path for uuid, making it available for any code that would require it,
without that code needing to know the path to it.

Fixes https://github.com/nasa/openmctweb/issues/211.
 2015-10-23 16:32:05 -07:00
Henry
896dd8d2c7 Fixed jslint errors 2015-10-23 16:30:51 -07:00
Henry
789b640b9b Refactored dismiss and minimize out of NotificationService and on to returned Notification type 2015-10-23 16:28:42 -07:00
Pete Richards
90828ef63d Merge remote-tracking branch 'github-open/open181' into open-master 2015-10-23 16:23:29 -07:00
Charles Hacskaylo
17b3378655 [Frontend] Expand/collapse styling 
open #90
Modding mini-tab look, just started;
 2015-10-23 15:36:52 -07:00
Charles Hacskaylo
efd209826d [Frontend] Inspector styling, in progress 
open #90
Significant styling in object-inspector.html;
 2015-10-23 15:14:07 -07:00
Victor Woeltjen
29bdc9d574 [Plot] Ignore empty lines 
Ignore empty lines (plot lines with no data) when determining
domain extrema; avoids failure to draw multiple plot lines in
a telemetry panel, nasa/openmctweb#150.
 2015-10-23 13:22:19 -07:00
Charles Hacskaylo
a7ea4c3c6e [Frontend] Inspector styling, in progress 
open #90
 2015-10-23 12:35:55 -07:00
Victor Woeltjen
bf24ac7c93 [Search] Update field name 
Update field name in GenericSearchProvider to reflect changes
from nasa/openmctweb#193. Avoids exceptions on mutation.

Additionally, add test case exercising relevant code and verifying
that reindexing is scheduled upon mutation as expected.
 2015-10-23 12:23:01 -07:00
Henry
e05858e26b Added newline to end of source files 2015-10-23 12:11:37 -07:00
Henry
89046ecad5 fixed jslint error 2015-10-23 12:03:56 -07:00
Henry
fa7431d68b Added test case to DialogServiceSpec 2015-10-23 12:01:48 -07:00
Henry
78b528b4a5 Added additional test cases, and some tidying 2015-10-23 11:48:37 -07:00
Charles Hacskaylo
1d3870d07f [Frontend] Manual integration of Inspector 
open #90
open #73
Adding missed new files;
 2015-10-23 11:42:06 -07:00
Charles Hacskaylo
2452b25fd4 [Frontend] Manual integration of Inspector 
open #90
open #73
In-progress manual integrated Sarah Hale's work on ObjectInspector;
 2015-10-23 11:37:02 -07:00
Charles Hacskaylo
0c4d422e2d [Frontend] Manual re-do of collapse/expand panes 
open #90
Refactored templates to move all split-pane elements into browse.html;
 2015-10-23 11:13:51 -07:00
Charles Hacskaylo
a283a2a0d3 [Frontend] Manual re-do of collapse/expand panes 
open #90
Animation, styles, hide-show added panes and splitters;
Finessed spacing;
trans-prop* mixins normalized and added delay arg;
 2015-10-23 10:52:28 -07:00
Charles Hacskaylo
827e1af581 [Frontend] Manual re-do of collapse/expand panes 
open #90
Added code to MCTSplitter and MCTSplitPane to allow
toggling of CSS class 'resizing' on pane elements when
the user is actively using the splitter;
Added resize transition animation to split pane elements
when user not actively resizing;
 2015-10-23 09:18:59 -07:00
Charles Hacskaylo
57f11a9767 [Frontend] Manual re-do of collapse/expand panes 
open #90
Refined positioning of .mini-tab elements when
panes are collapsed;
 2015-10-22 19:26:59 -07:00
Charles Hacskaylo
3687cc5edd [Frontend] Manual re-do of collapse/expand panes 
open #90
Fixed broken mobile styles;
Removed commented out scss;
 2015-10-22 18:45:47 -07:00
Charles Hacskaylo
bf17b77e82 Merge remote-tracking branch 'github/prod-uisymbols' into open90 2015-10-22 18:28:55 -07:00
Charles Hacskaylo
536d5616d4 [Frontend] Manual re-do of collapse/expand panes 
open #90
Major work on new .mini-tab elements, used
as controls to expand/collapse panes;
Cleaned up splitter hover behavior;
Changed mixin controlGrippy to not be tied
to :before;
 2015-10-22 18:28:25 -07:00
Victor Woeltjen
59f094763b Merge pull request #193 from nasa/search-performance 
Search performance
 2015-10-22 16:58:02 -07:00
Henry
e3ef68bc6f Fixed jslint errors 2015-10-22 16:41:09 -07:00
Henry
83276d70d3 Removed MessageSeverity enum and MessageController 2015-10-22 16:29:10 -07:00
Victor Woeltjen
111b3bac09 [Time Conductor] Remove dateService 
Replaced by timeService
 2015-10-22 16:27:21 -07:00
Victor Woeltjen
b4dd95490c [Time Conductor] Don't treat defaults as invalid 2015-10-22 16:07:21 -07:00
Victor Woeltjen
16e4c32709 [Time Conductor] Remove now dependency, fix domain switch 
Remove dependency on now (current time can be retrieved via
timeService); fix domain-switching behavior such that changes
to time systems are reflected in changes to default bounds.
 2015-10-22 16:05:09 -07:00
Victor Woeltjen
a154c9c870 [Time Conductor] Use timeService from control 2015-10-22 15:51:12 -07:00
Victor Woeltjen
5e9f38dadd [Time Conductor] Add dependency to UTCTimeProvider 2015-10-22 15:20:54 -07:00
Victor Woeltjen
552435b009 [Time Conductor] Add bundle for time handling 2015-10-22 15:20:12 -07:00
Henry
109ae3323d Added jsdoc and moved MessageController to dialogs from notifications 2015-10-22 15:10:53 -07:00
Charles Hacskaylo
4f27104663 [Frontend] Manual re-do of collapse/expand panes 
open #90
Implementing PaneController;
Added inspection pane and toggle button in
browse-object.html;
 2015-10-22 14:26:22 -07:00
Henry
0053989de8 renamed dialog and notification 'actions' to 'options' 2015-10-22 14:14:21 -07:00
Charles Hacskaylo
b98c1cdfe8 [Frontend] Manual re-do of collapse/expand panes 
open #90
Renamed BrowseTreeController to PaneController;
Ensuring mobile functionality parity;
 2015-10-22 13:34:16 -07:00
Victor Woeltjen
4ff03b081d [Time Conductor] Suppress date picker for non-UTC time systems 2015-10-22 13:08:37 -07:00
Victor Woeltjen
e8d7093eb5 [Time Conductor] Use time systems from time conductor 2015-10-22 13:07:04 -07:00
Victor Woeltjen
c0fda5b572 [Time Conductor] Add JSDoc 
Add typedefs relevant to the date aggregator; in particular,
document properties used to determine how to format timestamps
associated with a telemetry point.
 2015-10-22 12:41:46 -07:00
Victor Woeltjen
950578f09b [Time Conductor] Hide datetime pickers for non-UTC domains 2015-10-22 12:20:15 -07:00
Victor Woeltjen
117470068a [Time Conductor] Use dateService from TimeRangeController 2015-10-22 12:17:08 -07:00
Victor Woeltjen
0d47b7c47d [Time Conductor] Expose dateService in bundle definition 2015-10-22 12:10:12 -07:00
Victor Woeltjen
c882b2d4c3 [Time Conductor] Implement date provider 
Implement UTCDateProvider sufficient to pass spec.
 2015-10-22 12:08:34 -07:00
Victor Woeltjen
794231143e [Time Conductor] Add spec for UTCDateProvider 
Add test cases for UTCDateProvider, which will provide default
date/time formatting/parsing.
 2015-10-22 11:55:38 -07:00
Victor Woeltjen
6b42d3bf4b [Time Conductor] Test DateAggregator 2015-10-22 11:54:46 -07:00
Victor Woeltjen
1c5101eca6 [Time Conductor] Add DateAggregator 
Add DateAggregator, to allow composite services to expose
different ways of parsing/formatting dates.
nasa/openmctweb#182.
 2015-10-22 11:30:57 -07:00
Victor Woeltjen
dbebf08500 [Time Controller] Add test cases 
...to verify behavior on text entry of dates.
 2015-10-21 15:38:58 -07:00
Victor Woeltjen
847c356063 [Time Controller] Change color when input is invalid 
nasa/openmctweb#181
 2015-10-21 15:26:42 -07:00
Victor Woeltjen
06bcd28558 [Time Controller] Keep inputs in sync 
Keep inputs in sync with displayed data in time controller,
without overwriting user-entered text. nasa/openmctweb#181
 2015-10-21 15:22:00 -07:00
Victor Woeltjen
f88e8ebb51 [Time Controller] Update model state for text entry 2015-10-21 15:08:44 -07:00
Victor Woeltjen
6d2b2fd81e [Time Controller] Parse user-entered timestamps 
nasa/openmctweb#181.
 2015-10-21 14:46:12 -07:00
Victor Woeltjen
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
Victor Woeltjen
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
Pete Richards
496cf85b7e [JSDoc] Correct mistake 2015-10-21 09:46:32 -07:00
Pete Richards
833f57e284 [Search] Don't block UI between requests 
Timeout subsequent calls to keepIndexing at the end of a
indexRequest, so that UI operations are not blocked.
 2015-10-21 07:51:53 -07:00
Pete Richards
9a63e99710 [Search] Add spec for ElasticSearchProvider 
Add spec coverage for ElasticSearchProvider.  Also remove
unneeded guards for max number of results, as the aggregator
will always provide a max number of results.
 2015-10-20 16:01:42 -07:00
Pete Richards
77d81f899b [Style] JSLint compliance 2015-10-20 15:33:56 -07:00
Pete Richards
fe3263fdfe [Search] Remove invalid specs 2015-10-20 15:27:46 -07:00
Pete Richards
ce42429fbd [Search] expose constants, add fudge factor 
The SearchAggregator exposes it's constants to add stability to
tests.

It also has a fudge factor which increaases the number of results
it requests from providers to better support pagination when using
client side filtering.
 2015-10-20 15:17:15 -07:00
Pete Richards
76151d09a0 [Search] use service for filters, add spec 
Add a spec for the SearchController, and use the SearchService to
execute filters by supplying a filterPredicate.
 2015-10-20 15:17:15 -07:00
Pete Richards
ec7e6cc5b4 [Search] Update spec for Generic Search Worker 2015-10-20 15:17:14 -07:00
Pete Richards
1ddce48f7e [Search] Specs for GenericSearchProvider 
Write specs for GenericSearchProvider and resolve some implementation
bugs they uncovered.
 2015-10-20 15:17:14 -07:00
Pete Richards
98b5ff3c77 [Search] Decrement number of pending requests 2015-10-20 15:17:14 -07:00
Pete Richards
14094a48fc [Search] Remove old specs in prep for rewrite 
Remove old specs in prep for rewrite.
 2015-10-20 15:16:54 -07:00
Charles Hacskaylo
be79c104fb [Frontend] Added new glyph 
prod-uisymbols
Added e612 Save icon;
 2015-10-20 12:36:11 -07:00
Victor Woeltjen
8e2a2eeba5 [Entanglement] Add license headers 
...per code review feedback from nasa/openmctweb#175
 2015-10-19 12:08:49 -07:00
Charles Hacskaylo
fb0ce1eca8 [Frontend] New .loading class 
open #190
Removed old .loading styles previously
commented out;
 2015-10-19 11:13:50 -07:00
Pete Richards
0f63e4dde9 [Tests] Rewrite search aggregator specs 2015-10-16 17:06:23 -07:00
Pete Richards
12efb47be7 [Search] Remove timeouts and timestamps 
Remove timeouts and timestamps which were not effectively doing anything.
 2015-10-16 16:09:51 -07:00
Pete Richards
a2fce8e56c [Search] Rewrite elasticsearch provider with prototype 
Rewrite the elasticsearch provider to use prototypes and clean up the implementation.

Now returns a modelResults object to keep it in line with the general search
provider.
 2015-10-16 16:05:31 -07:00
Pete Richards
78e5c0143b [Search] Overhaul generic search provider 
Rewrite the generic search provider to use prototypes.  Increase performance
by utilizing the model service instead of the object service, and use a
simplified method of request queueing.
 2015-10-16 15:30:14 -07:00
Pete Richards
099591ad2e [Search] Aggregator returns objects, providers return models 
Search providers return search results as models for domain objects, as the
actual number of max results is enforced by the aggregator, and because the
individual providers store and return the models for their objects already.

This lowers the amount of resources consumed instantiating domain objects, and
also allows the individual search providers to implement function-based
filtering on domain object models, which is beneficial as it allows the search
filtering in the search controller to be done before paginating of results.
 2015-10-16 15:26:04 -07:00
Pete Richards
b5505f372f [Search] Generic Worker Performance Tweaks 
The generic search worker now does indexing work during the index operation,
ensuring that queries do not have to do extraneous or repeat calculations.

Change the return format slightly and fixed a bug in the GenericSearchProvider
which caused more objects than intended to be returned from the provider.
 2015-10-16 12:39:41 -07:00
Pete Richards
9ad860babd [Search] Rewrite search controller, tidy 
Rewrite the search controller, making numerous changes and using prototypical
style.

First, the search controller immediately hides previous results when a new
search is started.  Secondly, the search controller ensures that search results
displayed match the currently entered query, preventing race conditions.  Finally,
the search controller uses a poor filtering option that means it may not display
all results.
 2015-10-16 12:34:47 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
821a1a485c [Production] Updated symbols font to v25 
open #188
Added icon-dataset e611;
 2015-10-14 16:45:55 -07:00
Henry
f08725b6a2 Fixed jshint errors 2015-10-14 16:22:11 -07:00
Henry
301b73c6c6 Banner notifications are not maximized if 'info' message 2015-10-14 16:22:10 -07:00
Henry
912e70d219 Fixed failing tests, and added stopPropagation to prevent maximizing of notifications on action click or dismiss 2015-10-14 16:22:10 -07:00
Henry
1d41939418 Fixed failing tests 2015-10-14 16:22:10 -07:00
Henry
ee382be38d Added transitions and severity classes 2015-10-14 16:22:10 -07:00
Charles Hacskaylo
34ea3ad9bb [Frontend] Banner message animations; class renaming 
open #163
open #170
Added transition animations to message banners;
Renamed $colorStatus* class names to map more
closely to severity constants;
 2015-10-14 16:22:10 -07:00
Henry
2ba6f18c59 Making changes to implement display queue 2015-10-14 16:22:10 -07:00
Henry
b2a09599a0 Modified messages dialog launcher 2015-10-14 16:22:10 -07:00
Henry
11264759ec Added highest severity calculation in NotifiationService 2015-10-14 16:22:10 -07:00
Andrew Henry
c0ff6de27b Added notification indicator 2015-10-14 16:22:10 -07:00
Henry
60dda8a7a4 Updated 2015-10-14 16:21:54 -07:00
Charles Hacskaylo
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
Henry
82ae9e72c1 Integrated notifications list 2015-10-09 14:17:55 -07:00
Pete Richards
c703714cb3 Merge remote-tracking branch 'github-open/open115b' into open-master 2015-10-09 13:50:27 -07:00
Victor Woeltjen
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
Pete Richards
8c29c8ed0e Merge remote-tracking branch 'github-open/open151' into open-master 2015-10-09 13:38:20 -07:00
Henry
85300d3743 Refactored DialogService a little 2015-10-09 11:57:47 -07:00
Victor Woeltjen
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
Victor Woeltjen
2accf21518 [Time Conductor] Add missing semicolon 
...to pass code style checks.
 2015-10-09 11:08:02 -07:00
Victor Woeltjen
28c42fcd4c [Time Conductor] Fix merge issues 
Fix merge issues not addressed during conflict resolution.
 2015-10-09 11:06:41 -07:00
Henry
fe3e3325e1 Merge branch 'open170' into open155 2015-10-09 11:00:09 -07:00
Henry
2b97d61d6c Further integration work 2015-10-09 10:59:36 -07:00
Victor Woeltjen
1efa97e6f5 Merge remote-tracking branch 'github/master' into open115b 
Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
 2015-10-09 10:32:43 -07:00
Victor Woeltjen
756f728865 Merge remote-tracking branch 'github/open1515' into open-master 2015-10-09 10:11:11 -07:00
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
Pete Richards
fc0bfa77db Merge remote-tracking branch 'github-open/open141' into open141-integration 2015-10-09 09:52:35 -07:00
Pete Richards
12c6e53939 Merge remote-tracking branch 'github-open/open157' into open-master 2015-10-09 09:47:23 -07:00
Pete Richards
8093fcbda1 Merge remote-tracking branch 'github-open/open139c' into open-master 2015-10-09 09:42:22 -07:00
Victor Woeltjen
d902943552 [Time Conductor] Satisfy JSLint 
...in preparation to merge pull request nasa/openmctweb#162
 2015-10-09 09:36:57 -07:00
Victor Woeltjen
5f7c8ccadb Merge remote-tracking branch 'github/master' into open117b 2015-10-09 09:35:07 -07:00
Victor Woeltjen
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
Victor Woeltjen
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
Victor Woeltjen
ebd8fdeee3 [Time Conductor] Enforce inner minimums on outer changes 2015-10-09 07:32:46 -07:00
Charles Hacskaylo
954fdd5906 [Frontend] Sanding/positioning and Cancel button added to Messasges dialog 
open #159
open #170
Added Cancel button to Messages dialog in DialogService.js;
Important tweaks to layout of messages to allow
bottom-bar to align to bottom in singleton dialog view;
Revised status colors in theme's constants files;
 2015-10-08 19:10:26 -07:00
Victor Woeltjen
f738f84075 [Time Conductor] Enforce minimum outer span 2015-10-08 16:02:47 -07:00
Victor Woeltjen
cc19a0acba [Time Conductor] Enforce minimum inner span 
nasa/openmctweb#151.
 2015-10-08 15:51:23 -07:00