ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 06:27:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,389 Commits 989 Branches 212 Tags 191 MiB
c091063b83
Commit Graph

630 Commits

Author SHA1 Message Date
Victor Woeltjen
fffe07e7e6 [Timeline] Remove namespacing from specs 2015-10-23 14:06:55 -07:00
Victor Woeltjen
26db524f0e [Timelines] Rename bundle 2015-10-23 13:57:15 -07:00
Victor Woeltjen
4fcef33c58 [Timelines] De-namespace timeline's DateTimeController 2015-10-23 13:56:34 -07:00
Victor Woeltjen
dc9369c0f1 [Timelines] Remove namespacing from controllers 
WTD-1239
 2015-10-23 13:54:19 -07:00
Victor Woeltjen
c5b786e5e0 [Timeline] De-namespace capabilities 
WTD-1239.
 2015-10-23 13:52:48 -07:00
Victor Woeltjen
3e0534c4c3 [Timeline] Update namespacing in templates 
WTD-1239
 2015-10-23 13:49:46 -07:00
Victor Woeltjen
19ad4c8174 [Timelines] Change namespacing for directives 
WTD-1239
 2015-10-23 13:48:07 -07:00
Victor Woeltjen
8159c365b5 [Timeline] Remove namespacing from README 
WTD-1239
 2015-10-23 13:45:54 -07:00
Victor Woeltjen
307047d3ac [Clocks/Timers] Remove namespacing from specs 
WTD-1239
 2015-10-23 13:44:39 -07:00
Victor Woeltjen
83f135e48c Merge remote-tracking branch 'github/master' into open1239 2015-10-23 13:39:09 -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
Victor Woeltjen
e8d7093eb5 [Time Conductor] Use time systems from time conductor 2015-10-22 13:07:04 -07:00
Andrew Henry
92573b817f Added drag to enable edit mode 2015-10-20 21:03:36 -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
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
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
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
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
5f7c8ccadb Merge remote-tracking branch 'github/master' into open117b 2015-10-09 09:35:07 -07:00
Victor Woeltjen
146e948097 [Time Conductor] Remove telemetry series wrapper 
WTD-1515
 2015-10-02 16:47:13 -07:00
Victor Woeltjen
669b434c36 [Time Conductor] Test broadcast throttling 2015-10-02 16:38:32 -07:00
Victor Woeltjen
431c74ca49 [Time Conductor] Only update bounds when stable 2015-10-02 16:28:58 -07:00
Victor Woeltjen
cd0c0f77cc [Time Conductor] Throttle display bounds broadcasting 2015-10-02 16:20:31 -07:00
Victor Woeltjen
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
Victor Woeltjen
dd83816035 [Time Conductor] Remove queryStart, queryEnd 
...per feedback from code review, nasa/openmctweb#104
 2015-10-02 16:08:44 -07:00
Henry
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
Henry
a4f3e0d776 Plot domain labels showing 1970 if no data 2015-09-29 15:28:55 -07:00
Charles Hacskaylo
333f7cb848 [Frontend] Time controller-related styling 
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
 2015-09-29 08:43:34 -07:00
Victor Woeltjen
00ac249ee2 [Time Conductor] Position domain selector 
nasa/openmtweb#115
 2015-09-25 16:06:11 -07:00
Victor Woeltjen
00aa6821d1 Merge remote-tracking branch 'github/open117' into open115b 2015-09-25 15:31:27 -07:00
Victor Woeltjen
cbaf45afe9 [Time Conductor] Update specs 
nasa/openmctweb#115
 2015-09-25 10:40:19 -07:00
Victor Woeltjen
ff1fd26efc [Time Conductor] Change method name 
Prefer simpler method names for public API.
 2015-09-24 17:09:06 -07:00
Victor Woeltjen
4ced6c44a6 [Time Conductor] Ignore empty series 
...when updating Fixed Position view.
 2015-09-24 17:01:50 -07:00
Charles Hacskaylo
1d83516982 [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Significant re-org in menus.scss continued:
Refactored s-menu to s-menu-btn;
moved look-related style def's into .s-menu;
.menu now extends .s-menu;
 2015-09-24 15:38:52 -07:00
Victor Woeltjen
0c7de98195 [Time Conductor] Use active domain in binary search 2015-09-24 12:18:47 -07:00
Victor Woeltjen
6bd8e7a47c Merge remote-tracking branch 'github/master' into open1515 2015-09-24 11:17:13 -07:00
Victor Woeltjen
3d8aec2d01 [Time Conductor] Pass domain with events 2015-09-23 17:26:56 -07:00
Victor Woeltjen
f182d1f2c4 [Time Conductor] Include domain selection in requests 
...as well as use as default in a telemetry series.
 2015-09-23 17:14:40 -07:00
Victor Woeltjen
d238b669a5 [Time Conductor] Show domain options 2015-09-23 17:09:38 -07:00
Victor Woeltjen
5d5a7c26c5 [Time Conductor] Maintain domain state 
Maintain domain state in the time conductor; add a default list of
domains to choose from.
 2015-09-23 16:53:12 -07:00
Victor Woeltjen
0260e6fff4 Merge branch 'open1515' into open115 2015-09-23 16:05:09 -07:00
Charles Hacskaylo
9811443c71 Merge branch 'master' into open117 2015-09-23 15:54:48 -07:00
Victor Woeltjen
056b0c8c5b [Fixed Position] Use spaces instead of tabs 
...to satisfy code style checker and pass build,
in preparation for merge. nasa/openmctweb#118
 2015-09-23 12:59:04 -07:00
Victor Woeltjen
dbe1875e70 [Themes] Resolve conflicts 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
 2015-09-22 16:12:44 -07:00
Pete Richards
480da3476e Merge branch 'mobile' into mobile-integration 2015-09-22 10:55:43 -07:00
Charles Hacskaylo
65368ed0c3 [Config] Removed non-functional config options from Create dialogs; 
open #124
Removed "Default view" and "Display title by default" from
Panel configs;
 2015-09-18 13:43:29 -07:00
Charles Hacskaylo
f28d2f19d0 [Frontend/PLATFORM] Cherry picking from platform changes in vista65 
open #95
vista #65
scss and html mods for VISTA-related elements;
(cherry picked from commit 6ef3987)
 2015-09-16 17:17:54 -07:00
Victor Woeltjen
de71bde62f [Test Conductor] Add test case for requery 
WTD-1515
 2015-09-16 17:00:56 -07:00
Victor Woeltjen
190f5fd0ea [Time Conductor] Update failing specs 
WTD-1515
 2015-09-16 15:23:08 -07:00
Victor Woeltjen
ad29fb0f92 [Time Conductor] Populate FP from historical 
Populate fixed position view from historical
telemetry when first loaded. WTD-1515
 2015-09-16 13:38:47 -07:00
Victor Woeltjen
fcd073c010 [Time Conductor] Tweak plot requery 
Tweak approach to requerying in plot, and track
pending state so there is a visual indication
that plotted data may be incomplete during
panning with time conductor. WTD-1515
 2015-09-16 11:05:41 -07:00
Victor Woeltjen
9ebf157ec0 [Time Conductor] Test telemetry service decorator 
WTD-1515
 2015-09-15 11:18:28 -07:00
Victor Woeltjen
493c63be44 [Time Conductor] Test series wrapping 
WTD-1515
 2015-09-15 10:58:10 -07:00
Victor Woeltjen
f29951140f [Time Conductor] Add license header, JSDoc 
WTD-1515
 2015-09-15 10:22:43 -07:00
Victor Woeltjen
8ce8080253 [Timelines] Begin removing namespacing 
Begin de-namespacing timelines/activities for inclusion
in open source. WTD-1239
 2015-09-15 08:34:15 -07:00
Victor Woeltjen
96f72b3765 [Clocks] Add license, change keys 
Un-namespace keys in clock plugin, and add licensing
info for moment-duration-format. WTD-1239
 2015-09-14 16:52:56 -07:00
Victor Woeltjen
c932e953bc [Plugins] Bring over timeline, clock plugins 
WTD-1239
 2015-09-14 16:45:41 -07:00
Victor Woeltjen
d0478c3433 [Scrolling List] Check for existence of limit 
Check for existence of limit capability while evaluating
limits in a scrolling list view. WTD-1515
 2015-09-14 16:37:29 -07:00
Victor Woeltjen
53369ec0dc [Time Conductor] Avoid searching outside of series 
Don't look up domain values while subsetting a
telemetry series until after checking to ensure
that there is some segment of the series left
to search. WTD-1515
 2015-09-14 16:36:41 -07:00
Victor Woeltjen
de99969f0a [Time Controller] Return range values 
Delegate retrieval of range values appropriately in
conductor-driven telemetry series subset. WTD-1515
 2015-09-14 14:39:19 -07:00
Victor Woeltjen
24449d2dcc [Time Controller] Fix series subsetting 
Fix binary search implementation used to subset
telemetry series for time conductor. WTD-1515
 2015-09-14 11:44:50 -07:00
Victor Woeltjen
f42c5ca1e5 [Time Conductor] Subset to display bounds 
WTD-1515
 2015-09-14 11:25:42 -07:00
Victor Woeltjen
890aafc203 [Time Controller] Filter out realtime updates 
Filter out realtime updates that are outside of the time
controller's range. WTD-1515
 2015-09-14 10:02:59 -07:00
Charles Hacskaylo
3e5d46a62b [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Limits, plots, etc.;
Misc sanding and shimming;
Updated  symbols font to replace missing
Info symbol;
 2015-09-11 16:25:19 -07:00
Victor Woeltjen
2a14cf2dfc [Time Controller] Only listen for display-bounds changes 
...from plot. WTD-1515
 2015-09-11 11:31:12 -07:00
Victor Woeltjen
62962e119e [Time Controller] Decorate telemetry service 
Decorate telemetry service instead of capability service
to enforce time conductor bounds. WTD-1515.
 2015-09-10 16:17:48 -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
2758250833 [Time Conductor] Fix JSDoc 
Fix copy-paste error. WTD-1515
 2015-09-10 11:27:50 -07:00
Victor Woeltjen
78fae345da [Time Conductor] Rename TimeConductorController 
Rename TimeConductorController to TimeRangeController, to
reflect that this is intended to serve as a more general
control. Additionally, stop using arrays for inner and
outer bounds and instead use explicit start/end properties,
for clarity. WTD-1515
 2015-09-10 10:58:47 -07:00
Victor Woeltjen
4c79c9a1b1 [Time Conductor] Clarify start/end naming 
WTD-1515
 2015-09-10 10:21:21 -07:00
Victor Woeltjen
2ec9956d44 [Time Conductor] Incorporate feedback from code review 
Retain reference to scope in ConductorRepresenter
directly via this, instead of revealing via
a closure-bound function. This approach is not necessary
to avoid https://docs.angularjs.org/error/ng/cpws in
this circumstance.  WTD-1515
 2015-09-10 10:16:28 -07:00
Victor Woeltjen
e3b191b5dc [Time Controller] Update failing specs 
Update failing specs to reflect support for time conductor,
WTD-1515
 2015-09-09 16:52:46 -07:00
Victor Woeltjen
a4dda695dd [Time Controller] Get conductor working with fixed pos. 
WTD-1515
 2015-09-09 16:46:00 -07:00
Victor Woeltjen
fdbc91131b [Time Controller] Update bundle definition 
...for Fixed Position view to reflect changes to dependencies,
WTD-1515.
 2015-09-08 17:18:39 -07:00
Victor Woeltjen
d2dfec3ce7 [Time Controller] Simplify retrieval of datum objects 
...for historical data. Supports WTD-1515
 2015-09-08 17:03:58 -07:00
Victor Woeltjen
760f4b818f [Time Conductor] Update fixed position from history 
WTD-1515
 2015-09-08 16:53:06 -07:00
Victor Woeltjen
c026bfa17d [Time Conductor] Begin adding support to fixed position 
Begin adding support for universal time controller to
fixed position view, WTD-1515.
 2015-09-08 16:37:10 -07:00
Victor Woeltjen
4d276888e1 [Plot] Update failining spec 
WTD-1515
 2015-09-04 15:53:55 -07:00
Victor Woeltjen
142af3db77 [Time Controller] Add JSDoc 
WTD-1515
 2015-09-04 15:51:46 -07:00
Victor Woeltjen
b66759e519 [Plot] Initially establish bounds 
Initially establish domain bounds with time controller,
WTD-1515
 2015-09-04 15:31:47 -07:00
Victor Woeltjen
600ff1a3ee [Plot] Requery on event 
Requery on a query change event from a time conductor,
WTD-1515
 2015-09-04 15:07:46 -07:00
Victor Woeltjen
d158aa6028 [Plot] Follow time conductor more smoothly 
WTD-1515
 2015-09-04 14:04:09 -07:00
Victor Woeltjen
c2985d61b7 [Plot] Follow universal time controller 
Follow displayable area of universal time controller,
WTD-1515
 2015-09-04 13:57:26 -07:00
Victor Woeltjen
3ce40ab870 [Time Controller] Fix capability decoration 
WTD-1515
 2015-09-04 13:02:36 -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
5c1d209eff [Time Controller] Simplify ConductorRepresenter 
WTD-1515
 2015-09-04 11:53:51 -07:00
Victor Woeltjen
8a76c3a425 [Time Controller] Test conductor's telemetry capability 
WTD-1515
 2015-09-04 10:57:50 -07:00
Victor Woeltjen
9ccd0b9188 [Time Conductor] Test capability decorator 
WTD-1515
 2015-09-04 10:47:38 -07:00
Victor Woeltjen
f83588d980 [Time Controller] Begin adding test cases 
WTD-1515
 2015-09-04 10:32:01 -07:00
Victor Woeltjen
a481b377cb [Time Conductor] Add terminology note to readme 
WTD-1515
 2015-09-04 10:24:18 -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
Victor Woeltjen
436e010738 [Time Conductor] Broadcast changes 
WTD-1515
 2015-09-03 15:59:46 -07:00
Victor Woeltjen
bf4765fcb6 [Time Controller] Bind displayed control to state 
Bind changes to the displayed time controller to
changes to the underlying state of the time conductor,
WTD-1515.
 2015-09-03 15:13:03 -07:00
Victor Woeltjen
dbfb8b9861 [Time Controller] Add capability decorator 
WTD-1515
 2015-09-03 14:58:49 -07:00
Victor Woeltjen
681cd0bb9c [Time Controller] Add conductor service 
WTD-1515.
 2015-09-03 14:53:23 -07:00
Victor Woeltjen
b668fb58fb [Time Controller] Show only outermost controller 
WTD-1515
 2015-09-03 11:44:11 -07:00
Victor Woeltjen
f74da6b935 [Time Controller] Add overflow hidden 
Add overflow: hidden so that time controller does not exceed
edges of the screen. WTD-1515
 2015-09-03 11:40:40 -07:00
Victor Woeltjen
e4dec21ceb [Time Controller] Add telemetry capability wrapper 
WTD-1515
 2015-09-03 11:38:06 -07:00
Charles Hacskaylo
bb1a02c8bd [Frontend] Significant re-factoring of CSS and markup 
open #95
IN-PROGRESS!;
Mostly buttons and menus classes (s-btn and s-menu);
Removed unused templates and .css files;
Normalized some button containers;
 2015-09-02 18:02:58 -07:00
Victor Woeltjen
e873389655 [Conductor] Add time conductor widget 
Add widget for the time conductor using a representer,
WTD-1515.
 2015-09-02 15:57:52 -07:00
Charles Hacskaylo
5a991076ea [Frontend] CSS and markup tweaks to enable flex layout 
open #93
Layout frame and imagery markup modified;
 2015-08-31 12:34:34 -07:00
Shivam Dave
def5e17bb8 [Mobile] Merge 
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
 2015-08-26 14:07:52 -07:00
Charles Hacskaylo
e96d3e3738 [Mobile] IN PROGRESS: Significant redo of object-header 
open #74
Added .bar .l-flex using display: flex in object header;
 2015-08-24 12:22:08 -07:00
Victor Woeltjen
6aaa887e65 [Imagery] Start off with empty timestamp 
Show nothing in the timestamp area when there is no
data yet available for image telemetry, WTD-1170.
 2015-08-24 09:39:42 -07:00
Pete Richards
3a050cc5b8 [Style] space after operator 2015-08-24 09:03:31 -07:00
Charles Hacskaylo
ee608cc4a4 [Mobile] IN PROGRESS: General fixes, spurred by mobile, for object-header 
open #74
Attempting to layout using flex - not working;
See http://jsfiddle.net/charlesh88/cpf9zjts/9/ for working example;
New _flex.scss added;
This commit is changed elements that are mostly solid;
 2015-08-21 15:09:23 -07:00
Victor Woeltjen
7fe866060b [Code Style] Use prototypes in forms bundle 
WTD-1482.
 2015-08-14 13:44:08 -07:00
Victor Woeltjen
6302eee17e [Code Style] Use prototypes in Scrolling List bundle 
WTD-1482.
 2015-08-13 12:35:48 -07:00
Victor Woeltjen
820c15d74c [Code Style] Use prototypes in Plot bundle 
WTD-1482.
 2015-08-13 12:12:15 -07:00
Victor Woeltjen
aefad6fdd3 [Code Style] Continue refactor of Plot bundle 
Continue refactoring Plot bundle to use prototypes,
WTD-1482
 2015-08-13 10:26:04 -07:00
Victor Woeltjen
18bc7d3637 [Code Style] Begin using prototypes in Plot bundle 
WTD-1482
 2015-08-12 14:49:03 -07:00
Victor Woeltjen
175490e1f7 [Code Style] Use prototypes in Web Page bundle 
WTD-1482
 2015-08-12 14:32:05 -07:00
Victor Woeltjen
ed53808556 [Code Style] Use prototypes in Layout bundle 
WTD-1482
 2015-08-12 13:45:48 -07:00
Victor Woeltjen
a9e2d48036 [Code Style] Use prototypes in Imagery bundle 
WTD-1482
 2015-08-12 09:57:05 -07:00
Victor Woeltjen
d701567b70 [Code Style] Use prototypes for Events bundle 
WTD-1482
 2015-08-11 16:01:16 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs 
WTD-1482.
 2015-08-07 12:13:15 -07:00
Victor Woeltjen
eaaa1a19ca [JSDoc] Remove obsolete module references 
WTD-1482
 2015-08-07 11:55:38 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations 
Bulk-add JSDoc annotations, WTD-1482.
 2015-08-07 11:44:54 -07:00
Victor Woeltjen
2ca3c6ea93 [Layout] Use consistent whitespace 
Use consistent whitespace in array literals, WTD-1424.
 2015-08-04 10:00:44 -07:00
Victor Woeltjen
a4c704a5a2 [Layout] Ensure minimum frame size 
Ensure default frame size in a layout is not small,
even if the grid size for the layout is very small.
WTD-1424.
 2015-08-03 12:18:49 -07:00
Victor Woeltjen
deed95d8d1 [Plot] Don't allocate charts for empty plots 
Don't allocate WebGL charts for empty plots, WTD-1444.
 2015-07-17 09:13:20 -07:00
Victor Woeltjen
e400f211c4 Merge remote-tracking branch 'nasa/open1404' into open1427 
Merge in preparation for review/integration, WTD-1427

Conflicts:
	platform/commonUI/general/res/templates/containers/accordion.html
 2015-07-15 13:45:37 -07:00
Charles Hacskaylo
af2ca49b23 [Frontend] Added top right resize corner 
WTD-1404
WTD-1376
 2015-06-30 09:27:56 -07:00
Victor Woeltjen
5f80fcabc6 [Imagery] Clear background image 
Clear background image on change, WTD-1407.
 2015-06-29 18:49:36 -07:00
Victor Woeltjen
397a545482 [Plot] Expand range to give margin for points 
Expand range to give some margin for points near the edge,
WTD-1406.
 2015-06-29 18:08:03 -07:00
Victor Woeltjen
fa8095d5bc Merge branch 'open-master' into open1317limits2 
WTD-1405

Conflicts:
	platform/features/layout/res/templates/elements/telemetry.html
 2015-06-29 17:30:33 -07:00
Victor Woeltjen
0b4aa730f4 Merge pull request #30 from slhale/open26 
[Events] Create tests for real time version
 2015-06-29 15:42:33 -07:00
Victor Woeltjen
87f982b03e Merge remote-tracking branch 'nasa/open-master' into open-master 2015-06-29 15:10:02 -07:00
Victor Woeltjen
29283e4fb5 Merge branch 'open1233' into open-master 2015-06-29 15:09:40 -07:00
larkin
cc64412d78 Merge remote-tracking branch 'origin/open1344' into open-1348 2015-06-29 14:58:27 -07:00
larkin
52cf918d08 Merge remote-tracking branch 'origin/open1317' into open-1346 2015-06-29 14:44:24 -07:00
Sarah Hale
2ab3932ce1 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 14:43:19 -07:00
Sarah Hale
f816b5018a [Events] Style 
Removed unused variables. #26.
 2015-06-29 13:15:56 -07:00
Victor Woeltjen
ebbac233aa Merge branch 'open1373' into open-master 2015-06-29 13:15:43 -07:00
Sarah Hale
b91b197f5b [Events] Comments 
Removed todo comment. #26.
 2015-06-29 13:14:51 -07:00
Sarah Hale
14694c675b [Events] All tests work 
All of the tests for the RT Events are working. #26.
 2015-06-29 13:13:05 -07:00
Sarah Hale
56c3e72d32 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 13:10:46 -07:00
Sarah Hale
6616dedf63 [Events] Controller test correction 
Test for the RT Event List controller now
actually works. #26.
 2015-06-29 13:09:15 -07:00
larkin
38ad8058e8 Merge remote-tracking branch 'origin/open1223' into open-1338 
Resolve merge conflicts due to whitespace changes.
 2015-06-29 12:08:16 -07:00
larkin
84345caf7d [Style] Convert tabs to spaces 2015-06-29 11:51:28 -07:00
Sarah Hale
4c6b3c7a13 [Events] Policy test correction 
The view policy test for real time Messages
actually now works. #26.
 2015-06-29 09:56:59 -07:00
Sarah Hale
d120c8b139 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 09:10:23 -07:00
Victor Woeltjen
762f4d59fc [Layout] Disallow folders 
Disallow layouts in folders, WTD-1373.
 2015-06-27 12:43:32 -07:00
Sarah Hale
4e03d7b29b [Events] RT Messages policy test 
The view policy test for real time Messages
now works. #26.
 2015-06-26 15:17:17 -07:00
larkin
d729cfcd3e Merge remote-tracking branch 'origin/open1329' into open1343 2015-06-26 15:13:21 -07:00
larkin
f9782f1f45 Merge remote-tracking branch 'origin/open1273' into open-1340 2015-06-26 15:03:19 -07:00