Commit Graph

1210 Commits

Author SHA1 Message Date
Victor Woeltjen
fbf682d5fa [Plot] Support fixed duration
Support a fixed duration for plots, WTD-1273.
2015-06-20 10:28:49 -07:00
Victor Woeltjen
5ca954deaf [Plot] Test fallback on webglcontextlost
Add test case to verify that fallback occurs when a
WebGL context is lost, WTD-475.
2015-06-19 16:14:49 -07:00
Victor Woeltjen
a82fea2166 Merge pull request #5 from nasa/open1202
[Plot] Improve plotting performance
2015-06-19 16:05:18 -07:00
Victor Woeltjen
6b0a77d131 Merge pull request #8 from nasa/open1149
[Addressability] Use/populate URL
2015-06-19 16:05:10 -07:00
Victor Woeltjen
149ac44e8c Merge pull request #13 from nasa/open12
[Execution] Add worker service
2015-06-19 16:05:02 -07:00
Victor Woeltjen
b6fdf4d6ab [Plot] Fall back from WebGL on context loss
When a WebGL context is loss, fall back to displaying
plots using regular canvas 2d API. WTD-475.
2015-06-19 16:02:52 -07:00
Victor Woeltjen
dac44623ee [Plot] Begin adding WebGL fallback
Begin adding code to handle case where WebGL context
is lost, WTD-475.
2015-06-19 15:47:22 -07:00
Charles Hacskaylo
ae7dae011b [Dev/Frontend] New example event generator and event view
WTD-1304
github open18
New example generator;
New temporary view: features/events;
Updated scss and css;
2015-06-19 15:29:06 -07:00
Victor Woeltjen
4bc41e8aab Merge remote-tracking branch 'nasa/open1223' into open1223
Conflicts:
	platform/features/plot/res/templates/plot.html
2015-06-19 14:50:00 -07:00
Victor Woeltjen
71ca9803c2 [Core] Obey priority for capabilities
Obey priority for capabilities to allow this to be overridden
for other domain object types, WTD-1223.
2015-06-19 14:40:59 -07:00
Shivam Dave
6a35476872 Merge branch 'open1149' of https://github.com/nasa/openmctweb into open1149 2015-06-19 13:55:23 -07:00
Victor Woeltjen
3b62add011 Merge branch 'open-master' into open1223
Conflicts:
	platform/features/plot/res/templates/plot.html
2015-06-19 13:34:21 -07:00
Victor Woeltjen
67d1201214 Merge branch 'open-master' into open1272
Merge in latest from master branch into topic branch
for WTD-1272

Conflicts:
	platform/forms/test/controllers/DateTimeControllerSpec.js
2015-06-19 13:16:33 -07:00
Victor Woeltjen
b879de1a33 Merge branch 'open-master' into open1182 2015-06-19 12:22:05 -07:00
Victor Woeltjen
dbd7a65a7a Merge remote-tracking branch 'nasa/open1295' into open-master 2015-06-18 18:33:09 -07:00
Victor Woeltjen
8d80a2aee1 Merge branch 'open-master' into open1182 2015-06-18 18:23:19 -07:00
Victor Woeltjen
00229f01b1 [Plot] Test plot view policy
Test plot view policy, added in conjunction with image
telemetry; WTD-1170.
2015-06-18 17:11:11 -07:00
Victor Woeltjen
85e3101d08 [Plot] Expose plot view policy
Expose policy which suppresses image telemetry (and other
non-numeric telemetry) in plots. WTD-1170.
2015-06-18 17:00:20 -07:00
Victor Woeltjen
983a9a2f07 Merge remote-tracking branch 'nasa/open1170' into open1170 2015-06-18 16:58:44 -07:00
Victor Woeltjen
66b143c9d7 [Plot] Suppress plot for non-numeric telemetry
Avoids plot views becoming erroneously available for image
telemetry, WTD-1170.
2015-06-18 16:58:29 -07:00
Victor Woeltjen
51bd205502 [Imagery] Be flexible about format
Accept either image or imageUrl as format for image telemetry,
WTD-1170.
2015-06-18 16:53:52 -07:00
Shivam Dave
0292f046da [Browse Composition] Removed Window Alert
Removed commented out code that
alerts the user if they cannot
perform a drag and drop. Inserted a
comment marking where an alert can be placed
Issue 11.
2015-06-18 15:23:51 -07:00
Charles Hacskaylo
0201a4bcf8 [Frontend] Fix to prevent infobubbles from preventing clicks
GitHub-12
Added CSS class "bubble-container" to BUBBLE_TEMPLATE;
bubble-container utilizes CSS "pointer-events: none";
Changed INFO_HOVER_DELAY constant from 500ms to 2000ms;
2015-06-18 15:18:42 -07:00
Victor Woeltjen
056c087953 [Representation] Add missing argument to spec
Add missing argument to spec for mct-representation, WTD-1256.
2015-06-18 15:09:17 -07:00
Shivam Dave
dab6d96688 [Browse composition] Not Alerting User
In this case the user is not alerted. This
is to test the maven build. Issue 11.
2015-06-18 15:08:13 -07:00
Sarah Hale
1f3c1da8c7 [Browse composition] Alert user
When the user attempts a disallowed drag and drop composition,
the browser will alert them to this. Issue 11.
2015-06-18 14:53:35 -07:00
Victor Woeltjen
275ca01692 [Representation] Trust template URLs
Trust resource URLs to skip SCE-checking (which profiling
flags as a performance problem) for mct-include and
mct-representation; these URLs are pulled from bundles and
not user-entered, so should be trusted. WTD-1256.
2015-06-18 14:43:14 -07:00
Sarah Hale
451842fb82 [Browse composition] Cleanup
Removed commented out code in tests. Issue 11.
2015-06-18 14:29:46 -07:00
Sarah Hale
9e52ddaee7 [Browse composition] Added and modified tests
Added additional tests to account for the different cases of
edit mode and folder vs non folder. Issue 11.
2015-06-18 14:26:54 -07:00
Victor Woeltjen
640a399278 [Workers] Add example worker
Add an example worker which inefficiently calculates
fibonacci numbers outside of the UI thread, for #12.
2015-06-18 11:21:00 -07:00
Victor Woeltjen
7d911a3fe0 [Workers] Add worker service
Add service for running WebWorkers, #12.
2015-06-18 10:59:10 -07:00
Shivam Dave
a8488a92d9 [Gestures] Browse/Edit Composition
Disallows drag and drop during browse mode,
unless dragging and dropping into a folder
view. Allows drag and drop into a layout view
only in edit mode also. Can be unit tested now.
WTD-11.
2015-06-18 10:54:51 -07:00
Charles Hacskaylo
ab81c9070e [Frontend] Remove static-markup file
WTD-1170
2015-06-18 10:09:17 -07:00
Charles Hacskaylo
69f4b4975e Merge branch 'open-master' into open1170b
Conflicts:
	platform/commonUI/general/res/sass/plots.scss
	platform/commonUI/inspect/src/InfoConstants.js
	platform/features/imagery/src/policies/ImageryViewPolicy.js
	platform/features/static-markup/res/markup.html
2015-06-18 09:55:26 -07:00
Charles Hacskaylo
0949ada734 [Frontend] Manual update of platform css, fonts and sass only from open-master
WTD-1170
2015-06-18 09:46:54 -07:00
Victor Woeltjen
897433f717 [Imagery] Test ImageryController
WTD-1170.
2015-06-17 21:15:17 -07:00
Victor Woeltjen
ba88281bd0 [Imagery] Test mct-background-image
WTD-1170.
2015-06-17 20:51:41 -07:00
Victor Woeltjen
c41db4f22b [Imagery] Test policy
Test policy which restricts the Imagery view to domain objects which
have image telemetry. WTD-1170.
2015-06-17 20:41:40 -07:00
Victor Woeltjen
8aa25a929a [Imagery] Add skeleton specs
Add skeleton specs for the Imagery view of telemetry,
WTD-1170.
2015-06-17 20:35:17 -07:00
Victor Woeltjen
2690a8b8e2 [Imagery] Add JSDoc
Add JSDoc to classes implementing the Imagery view, WTD-1170.
2015-06-17 20:31:47 -07:00
Victor Woeltjen
12954f8fc3 [Imagery] Add open-in-new-tab button
Add button to open current telemetry image in a new tab,
WTD-1282 (in the context of WTD-1170.)
2015-06-17 20:21:53 -07:00
Victor Woeltjen
5a4a912f79 [Imagery] Only display images when loaded
Wait until image telemetry is completely loaded before
displaying it, WTD-1170.
2015-06-17 20:12:04 -07:00
Victor Woeltjen
dc85d3c191 Merge pull request #4 from nasa/open884
[Info Bubble] Add info bubble
2015-06-17 11:47:34 -07:00
Charles Hacskaylo
2677dcd10c Merge branch 'open-master' into open1295
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_main.scss
2015-06-17 11:00:53 -07:00
Victor Woeltjen
0ae1ba4a40 [Edit] Don't wrap non-editable objects
In Edit mode, don't bother wrapping domain objects which should
not be edited even in principle. Avoids insulating these objects
from updates which occur asynchronously, which in turn avoids
WTD-1291.
2015-06-17 10:23:16 -07:00
Victor Woeltjen
ee69eb3a01 [Addressability] Fix code style
Change code style to satisfy JSLint for changes from WTD-1149.
2015-06-16 16:10:31 -07:00
Victor Woeltjen
5849f8afe2 [Addressability] Add spec for BrowseObjectController
Add spec for BrowseObjectController, added to track current
view selection from/to query string params, WTD-1149.
2015-06-16 16:09:22 -07:00
Victor Woeltjen
c1c633db80 [Addressability] Add test cases
Add test cases to BrowseController which reflect changes for
addressability, WTD-1149.
2015-06-16 15:57:08 -07:00
Victor Woeltjen
bcb4e9c495 [Addressability] Remove excessive check
Remove unneeded check from ViewSwitcherController; not necessary
to avoid overwriting query string selection of view. WTD-1149.
2015-06-16 15:40:19 -07:00
Victor Woeltjen
699cd3bd90 [Addressability] Update spec for BrowseController
Update spec to reflect changes for BrowseController to support
addressability of domain objects, WTD-1149.
2015-06-16 15:35:40 -07:00
Victor Woeltjen
9942e24039 [Addressability] Work around reload again
Work around Angular's page refresh on URL change to avoid
unintended effects when chosen view changes (such as tree
collapse), WTD-1149.
2015-06-16 15:23:55 -07:00
Victor Woeltjen
d559dae1e2 [Addressability] Expose current view in query param
Expose the currently selected view as a query string parameter,
WTD-1149.
2015-06-16 15:09:42 -07:00
Victor Woeltjen
fec6f06849 [Addressability] Obey view query string param
Obey the query string parameter for a view, if present.
WTD-1149.
2015-06-16 14:58:03 -07:00
Victor Woeltjen
26fd56a003 [Addressability] Handle bad paths
Handle paths that cannot be completely followed, WTD-1149.
2015-06-16 14:35:15 -07:00
Victor Woeltjen
d7b79b6b69 [Addressability] Preserve nav. state on leaving Edit
Preserve navigation state when leaving Edit mode, in the context
of addressability changes. WTD-1149.
2015-06-16 14:29:22 -07:00
Charles Hacskaylo
c428df524c Merging in open1248, resolve conflicts 2015-06-16 14:07:53 -07:00
Charles Hacskaylo
4887ba0e58 Merge in open-master, resolve conflicts 2015-06-16 13:53:00 -07:00
Victor Woeltjen
3738ea16d7 [Addressability] Update route without reinstantiating
Work around normal behavior of Angular when path changes;
instead of reinstantiating controller for Browse mode
when Browse-initiated path changes occur, act as if the
route hadn't changed (so that the URL updates but the
currently-displayed state, e.g. tree expansion, is
preserved.) WTD-1149.
2015-06-16 13:44:35 -07:00
Victor Woeltjen
084d6b6859 [Addressability] Update path on navigation
Update path in browse mode when navigation state changes.
WTD-1149.
2015-06-16 13:28:19 -07:00
Victor Woeltjen
9fae2db04a [Addressability] Infer ROOT
Treat the path element for the root domain object as implicit, such
that it does not appear in the full URL. WTD-1149.
2015-06-16 13:16:55 -07:00
Victor Woeltjen
8f18d88705 [Addressability] Navigate down path from params
Traverse down the path from route parameters to initially navigate to a
domain object in Browse mode. WTD-1149.
2015-06-16 13:14:12 -07:00
Victor Woeltjen
f24db1561e [Addressability] Get IDs from URL
Add a route parameter to Browse mode which includes domain
object identifiers. WTD-1149.
2015-06-16 13:00:03 -07:00
Charles Hacskaylo
70e1a8ad9e [Frontend] Mods to layout element drag handles and editing behavior
WTD-951
layout.html:
Added classes to and removed inline styles from drag handles,
Removed edge handles, leaving corner handles in NW, SW and SE only;
Added hover classes to display corner handles while editing;
Modified z-indexing to allow view switcher to be accessed while editing;
2015-06-16 12:40:48 -07:00
Charles Hacskaylo
a984e60ca5 [Frontend] Mods to layout element editing handles
WTD-951
In-progress checkin
2015-06-16 10:48:31 -07:00
Charles Hacskaylo
d614d7ee86 [Frontend] Very minor tweaks to bring open into parity with lastest scss from ue-frontend
WTD-1292
Tweaks prior to rebuild of ue-frontend branch;
2015-06-15 17:43:52 -07:00
Victor Woeltjen
9051a7114c [Plot] Remove OOB glow
Remove glow for out-of-bounds data from plot; WTD-1255,
in the context of work in progress on WTD-1223.
2015-06-15 17:37:31 -07:00
Victor Woeltjen
f6eb9904ff Merge remote-tracking branch 'nasa/open839' into open839 2015-06-15 16:48:33 -07:00
Victor Woeltjen
d03cab21b2 Merge remote-tracking branch 'nasa/open949' into open839 2015-06-15 16:47:58 -07:00
Charles Hacskaylo
d8a66b426f [Merge] Merging open-master in; resolved conflicts 2015-06-15 16:47:23 -07:00
Charles Hacskaylo
043a2ed581 Merging in open-master 2015-06-15 16:38:20 -07:00
Victor Woeltjen
db0cd9cf3a [Clocks/Timers] Merge in latest CSS
Merge in latest CSS from WARP-specific branch, WTD-1220.
2015-06-15 16:15:26 -07:00
Charles Hacskaylo
6e7203a49f [Merge] Cherrypick 2 from warp1220
WTD-1220
2015-06-15 15:45:40 -07:00
Charles Hacskaylo
5193c62233 [Merge] Cherrypick 1 from warp1220
WTD-1220
2015-06-15 15:44:09 -07:00
Victor Woeltjen
6aff6d8d2b [Forms] Update spec for date-time control
WTD-1272.
2015-06-15 13:05:37 -07:00
Victor Woeltjen
05a114cc75 [Forms] Use MM-DD in date-time control
Use month and day instead of day-of-year in date-time
control, WTD-1272.
2015-06-15 13:01:43 -07:00
Charles Hacskaylo
7c7b79e151 [Config] Changed priority from mandatory to preferred
WTD-949
2015-06-12 19:00:55 -07:00
Charles Hacskaylo
c6c4fa7182 [Fronted] Fixes for misaligned bubbles
WTD-1247
WTD-884
Changed CSS .l-infobubble-wrapper abs > relative;
Added display: block class for mct-container;
Tweaked bubble evaluation JS for 'goLeft' behavior;
Added constants for bubble max width and left/right margin;
2015-06-12 16:24:25 -07:00
Charles Hacskaylo
0b46050e04 [Fronted] Tweaks to bubbles and context menus scss
WTD-1248
WTD-884
Changed z-index of context menus and bubbles to put the menus above;
Changed text wrapping of 'value' td to no-wrap;
Changed min and max-width of .l-infobubble;
2015-06-12 15:46:31 -07:00
Charles Hacskaylo
39531a0a9f [Fronted] Minor final sanding and polishing
WTD-839
.t-view-switcher > .view-switcher;
Added CSS transition to hide/show of view-switcher;
Moved .view-switcher hide/show to _frame.scss;
Tweaked .frame:hover to raise z-index to show complete border;
2015-06-12 14:17:19 -07:00
Charles Hacskaylo
8f153d4e75 [Fronted] Significant refactoring of mixins for containers and buttons
WTD-839
Removal of 'icon-btn' class from *.html;
Cleanup of markup in switcher.html;
'name' span is now hidden when switcher is within frame;
Commented out unused css classes in _controls.scss,
Normalization of markup in object header when in main view and framed objects;
Icon sizing fixed in menus and switcher control;
Tightened up spacing in menus;
2015-06-12 11:44:09 -07:00
Victor Woeltjen
3a79801579 [Glyphs] Use placeholder glyphs for actions
Use placeholder glyphs for move, copy, link; completing
integration of #6.
2015-06-12 10:27:35 -07:00
larkin
bff272e326 [JSDoc] Add class-level documentation 2015-06-12 10:08:34 -07:00
Charles Hacskaylo
af0c2e7827 [Fronted] Significant refactoring of mixins for containers and buttons
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Cleanup of markup to remove 'icon' class from invoke-menu elements;
2015-06-12 10:00:51 -07:00
larkin
d32c05a313 [Style] Add newline at end of file 2015-06-12 09:57:28 -07:00
larkin
11beea9dfd [Glyphs] New Glyphs for Actions 2015-06-12 09:56:22 -07:00
larkin
c6186ae186 [Entanglement] Correctly Call Policy Service
Move, Copy, and Link services correctly call the policy service to
check whether composition is allowed.  Fixes open-1254.
2015-06-12 09:45:12 -07:00
larkin
d041655546 [Licenses] Add License Headers 2015-06-11 14:22:18 -07:00
Victor Woeltjen
e70ceb12d7 [Imagery] Begin adding mct-image
Begin adding directive to preload images before displaying
them, to avoid flashing of imagery as it arrives. WTD-1170.
2015-06-11 14:12:36 -07:00
larkin
1525657ac2 [Task] Remove TODOS 2015-06-11 13:09:02 -07:00
larkin
9123078293 [Entanglement] Add entanglement bundle
The entanglement bundle defines move, copy, and link actions, and
exposes them as context menu actions.

* The Move action moves an object from it's current parent to a new
parent object.
* The Copy action deep-copies an object to a new parent object.
* The Link action links an object to a new parent object.

These actions are implemented by three new services: moveService,
copyService, and linkService.

Mocks are provided for each service for easy testing of components
that depend on them.

Additionally, this bundle provides a DomainObjectFactory that simplifies
the construction of mockDomainObjects for tests.

These actions are exposed to the user as context menu options.
2015-06-11 13:09:01 -07:00
larkin
8811f2a53e [Creation] createObject returns newObject
createObject returns a promise which is resolved when the object
has been persisted.  The promise is resolved with an instance of the
new domainObject.
2015-06-11 13:09:01 -07:00
Charles Hacskaylo
0b8d5ceb86 [Fronted] Significant refactoring of btn classes
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Moved btn styles from _controls.scss to _buttons.scss;
Markup cleaned up with css classing simplified;
2015-06-10 17:23:08 -07:00
Victor Woeltjen
60296b5323 [Core] Add newlines
Add newlines to scripts added to core for WTD-1202.
2015-06-10 17:05:28 -07:00
Victor Woeltjen
500d88b5a1 [Plot] Update spec
Update spec for PlotController to account for usage of the
throttle service, WTD-1202.
2015-06-10 17:02:16 -07:00
Victor Woeltjen
35b5fbefd0 [Plot] Throttle updates
Throttle plot updates to subplots; WTD-1202.
2015-06-10 16:54:01 -07:00
Victor Woeltjen
e06d11dcb2 [Core] Add throttle service
Add service for throttling function calls; specifically supports
reducing tick mark recalculation, WTD-1202.
2015-06-10 16:53:43 -07:00
Victor Woeltjen
d1a09c0180 [Telemetry] Remove linear search
Remove linear search for unused positions when queuing telemetry
updates; instead, track available positions such that insertion
is more performant at a modest cost (bound to the number of subscriptions)
of retrieval. Additionally, add implementation notes in-line.
WTD-1202.
2015-06-10 16:53:35 -07:00
Victor Woeltjen
732c0abf10 [Info Bubble] Add newlines
Add newlines to end of files added for WTD-884.
2015-06-10 16:40:22 -07:00
Charles Hacskaylo
5219105887 [Config] Modified priority to make plot the default view
WTD-949
Plot is now the default view when browsing objects,
or in-frame in Display Layouts;
2015-06-10 15:31:37 -07:00
Charles Hacskaylo
bd66c0138b [Merge] Bringing in latest ue-frontend 2015-06-10 15:20:38 -07:00
Victor Woeltjen
fd63aa30ea [Forms] Add test for date-time controller
Add test case to complete coverage of date-time controller;
done in the context of WTD-884 (albeit unrelated) to improve
code coverage.
2015-06-10 14:31:34 -07:00
Charles Hacskaylo
d7e43026cd [Merge] Merge in open-master, resolve conflicts in _constants.scss 2015-06-10 14:04:48 -07:00
Victor Woeltjen
b9ea876101 [Imagery] Allow pausing imagery
WTD-1170.
2015-06-09 16:56:47 -07:00
Charles Hacskaylo
1795dc5549 Merging in /platform specific changes from warp1220 2015-06-09 16:44:18 -07:00
Victor Woeltjen
ee542293b9 [Imagery] Display image updates
WTD-1170.
2015-06-09 16:31:51 -07:00
Victor Woeltjen
277533b4bf [Imagery] Begin adding controller
Begin adding controller for Imagery view, WTD-1170.
2015-06-09 16:07:17 -07:00
Victor Woeltjen
627fa267f4 [Imagery] Add imagery view bundle
Add a bundle which contains view for image telemetry.
Template is a placeholder; view is restricted by policy
to telemetry-providing domain objects which actually have
image telemetry. WTD-1170.
2015-06-09 15:40:42 -07:00
Victor Woeltjen
bc6b3f8902 Merge branch 'open-master' into open1170 2015-06-09 11:41:44 -07:00
Victor Woeltjen
40f36541fa [Core] Add missing models
When requested models are missing, add models of an explicitly
unknown type to allow this to be expressed to the user.
WTD-1241.
2015-06-09 10:31:17 -07:00
Pete Richards
e6d830bfdc Merge pull request #1 from nasa/open1221
[Platform] Tweak misc. items to support clocks/timers
2015-06-09 10:23:06 -07:00
Victor Woeltjen
de3c6e4543 [Fixed Position] Show limits in fixed position
Show limits in fixed position view, WTD-1223.
2015-06-09 10:18:28 -07:00
Victor Woeltjen
51852e1322 [Limits] Use datum for limits in scrolling list view
Utilize 'datum' API when displaying limits in a scrolling list
view, WTD-1223.
2015-06-09 10:07:00 -07:00
Pete Richards
eb9446dd14 Merge pull request #2 from nasa/open1199
[Example] Add minimal web server
2015-06-09 09:47:16 -07:00
Charles Hacskaylo
7a93b7d77a Pulled in final sanding on bubbles.scss from open1222 2015-06-09 09:32:28 -07:00
Charles Hacskaylo
277b8e74b6 [Frontend] Final sanding on bubbles.scss
WTD-1222
2015-06-09 09:28:59 -07:00
Charles Hacskaylo
cec115976c Merged latest from open-master and open1222 platform/ 2015-06-08 16:00:24 -07:00
Victor Woeltjen
35b5b29d03 [Limits] Use datum for scrolling list
Use notion of a datum from scrolling list view when
evaluating limits, WTD-1223.
2015-06-08 15:34:17 -07:00
Victor Woeltjen
2a4bf7b95a [Limits] Use datum for plots
Use datum for limits in a plot, WTD-1223.
2015-06-08 15:33:41 -07:00
Victor Woeltjen
4544167b50 [Telemetry] Provide latest telemetry datum
Provide latest telemetry as a datum to begin transitioning
toward revised telemetry API, particularly as used from limits;
WTD-1223.
2015-06-08 15:26:02 -07:00
Charles Hacskaylo
1587e66d9e [Frontend] Added local zoom/reset controls
WTD-1222
Refactored scss in plots-main slightly;
Removed unused sass/plots.scss;
2015-06-08 15:24:17 -07:00
Charles Hacskaylo
5aad1b4e30 [Frontend] Removing unused firs-order scss file 2015-06-08 15:08:43 -07:00
Charles Hacskaylo
03252aac1b [Frontend] Ported over all /platform changes from warp1222
WTD-1222
2015-06-08 13:50:54 -07:00
Charles Hacskaylo
b18159b8e1 Merging in latest from ue-frontend 2015-06-08 13:45:31 -07:00
Victor Woeltjen
4ab36bd421 [Limits] Show limits from scrolling list view
WTD-1223.
2015-06-08 11:57:05 -07:00
larkin
689701b37f [Licenses] Add License Header 2015-06-08 11:23:25 -07:00
Charles Hacskaylo
9f90c6b8d8 [Frontend] Updated CSS; removed position: relative
WTD-884
2015-06-08 11:14:58 -07:00
larkin
eb1621dad9 Merge branch 'open1200' into open-1201 2015-06-08 11:11:50 -07:00
Victor Woeltjen
f4adc6a889 Merge branch 'open-master' into open1223
Merge in latest from master branch into topic branch for
limits, WTD-1223.

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/plots.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	platform/commonUI/general/res/sass/plots/_plots-main.scss
	platform/features/scrolling/res/templates/scrolling.html
2015-06-08 10:23:36 -07:00
Victor Woeltjen
3a36fda8ab Merge remote-tracking branch 'nasa/open1219' into open1229
Merge changes for WTD-1219; WTD-1229

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
2015-06-08 09:53:33 -07:00
Victor Woeltjen
88f938b1b6 [Limits] Begin using limits from scrolling list view
WTD-1223.
2015-06-05 17:59:58 -07:00
Victor Woeltjen
dc6c43a4cd [Limits] Display limit state in legend of plot
WTD-1223.
2015-06-05 17:15:02 -07:00
Charles Hacskaylo
e216961727 Pulling in all sass, css, etc. and static-markup work from warp1222 so far 2015-06-05 16:48:58 -07:00
Victor Woeltjen
9a3ccc3295 [Limits] Merge in latest from platform
Merge in latest changes to platform to begin implementing
limits, WTD-1223.
2015-06-05 16:28:29 -07:00
Victor Woeltjen
d2a75c4338 [Info Bubble] Add test cases for gesture
Add test cases for the info gesture, WTD-884.
2015-06-05 06:31:23 -07:00
Victor Woeltjen
1567c32993 [Info Bubble] Add license headers
Add license headers to scripts for info bubbles, WTD-884.
2015-06-04 16:41:34 -07:00
Victor Woeltjen
21c066e10f [Info Bubble] Add test cases for infoService
WTD-884.
2015-06-04 16:38:55 -07:00
Victor Woeltjen
640b39e3a0 [Info Bubble] Begin adding tests
Begin adding tests for info bubble, WTD-884.
2015-06-04 16:27:41 -07:00
Victor Woeltjen
90ba93e396 [Info Bubble] Test metadata capability
Test metadata capability, introduced to support info bubbles
for domain objects, WTD-884.
2015-06-04 14:16:23 -07:00
Victor Woeltjen
cae8372d34 [Info Bubble] Include type in common metadata
Include type in common domain object metadata to display
in an info bubble, WTD-884.
2015-06-04 12:34:56 -07:00
Victor Woeltjen
c9e33b1d31 [Info Bubble] Change moment import
Change the path used to import moment for the telemetryFormatter.
Previously, a relative path was used; since telemetryFormatter was
initially implemented, however, moment has been made available as
simply moment by require configuration changes elsewhere. Inconsistent
usage of moment here can result in load timeouts under certain
script load orderings. Changed in the context of WTD-884 (which does
use moment elsewhere.)
2015-06-04 12:32:37 -07:00
Victor Woeltjen
11dc5f380c [Info Bubble] Use domain object metadata
Use domain object metadata to populate the info bubble from
the info gesture, WTD-884.
2015-06-04 12:30:18 -07:00
Victor Woeltjen
6622ca7031 [Info Bubble] Add common properties to metadata
Expose common properties (like time updated) from the metadata
capability, to appear in the Info bubble. WTD-884.
2015-06-04 12:26:57 -07:00
Victor Woeltjen
cd26d1284e [Info Bubble] Add metadata capability
Add metadata capability, which will be used to populate
contents of an info bubble. WTD-884.
2015-06-04 12:09:50 -07:00
Victor Woeltjen
450bc059e4 Merge branch 'open-master' into open1199 2015-06-04 10:40:34 -07:00
Victor Woeltjen
588c35de4e Merge branch 'open-master' into open884
Merge latest from master branch into topic branch for WTD-884
2015-06-04 10:39:25 -07:00
Victor Woeltjen
fcd214ed60 [Forms] Show initial value in datetime control
Initialize value for datetime control based on available
data, and keep up-to-date with changes from UI. Supports
clocks/timers, which use datetime as an entry field,
WTD-1221.
2015-06-04 09:16:25 -07:00
Victor Woeltjen
2648f01966 [Composition] Disallow composition for leaf types
Disallow composition for domain object types which will
not have a composition property; WTD-1221.
2015-06-04 09:16:12 -07:00
Victor Woeltjen
e452921729 [Core] Revise explicit setting of modified timestamp
Allow undefined as an explicit value for a domain
object's modification timestamp (as set via the
mutation capability.) Avoids a bug in minimal auto-refresh,
being added for WTD-1221.
2015-06-04 09:16:08 -07:00
Victor Woeltjen
28805cd55c [Forms] Add test cases to DateTimeController
Add test cases for behavioral changes to DateTimeController,
added for WTD-1221.
2015-06-04 09:15:39 -07:00
Victor Woeltjen
45568ecb21 [Forms] Allow date-time controls to be optional
Don't force date-time inputs to act as if they are
required; allow them to be treated as optional, but
enforce that this only occurs when left completely
empty (as opposed to partially complete.)

Supports WTD-1221.
2015-06-04 09:15:04 -07:00
Charles Hacskaylo
6fe6aacc38 Added open source comment 2015-06-03 10:25:37 -07:00
Charles Hacskaylo
b022babedb Adding static-markup bundle. 2015-06-03 10:23:49 -07:00
Victor Woeltjen
a18a7c9960 [Layout] Fix comment
Change inaccurate comment based on feedback from code
review for WTD-1182.
2015-06-03 07:49:11 -07:00
Charles Hacskaylo
f23f127207 [Frontend] Markup and CSS for Time Controller
WTD-1219
Markup, CSS, etc. for time controller;
New template .html file;
Rebuilt from open-master and ue-frontend branches;
2015-06-02 19:29:57 -07:00
Charles Hacskaylo
c20ad3764d Merge branch 'open-master' into ue-frontend
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/lists/_tabular.scss
2015-06-02 18:26:49 -07:00
Charles Hacskaylo
48c4282416 Merge branch 'open-master' into ue-frontend
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/lists/_tabular.scss
2015-06-02 18:25:26 -07:00
Charles Hacskaylo
6104201d89 [Frontend] Markup and CSS for revised scrolling tabular view
WTD-1217
2015-06-02 17:45:39 -07:00
Charles Hacskaylo
0fbb54add3 Merging ue-frontend 2015-06-02 17:44:59 -07:00
Charles Hacskaylo
b09ec23617 [Frontend] Renew of ue-frontend
Picks up markup and CSS changes from
open1174 (breadcrumbs)
2015-06-02 16:12:19 -07:00
Victor Woeltjen
ff1d4854a8 Revert "[Licenses] Remove license ref from dialog"
This reverts commit 2ca789e36a.
Change was made to misunderstanding of instructions; WTD-1051.
2015-05-29 10:08:43 -07:00
Victor Woeltjen
1415e9e72f [Licenses] Add missing copyright/license info
WTD-1051.
2015-05-29 10:05:59 -07:00
Victor Woeltjen
61bc662efb [Licenses] Add missing copyright years
WTD-1051.
2015-05-22 14:48:53 -07:00
Victor Woeltjen
219a6086d8 [Info Bubble] Remove placeholder type/view
Remove Info Bubble as a type and view, which had been present
for purposes of example during development. WTD-884.
2015-05-22 13:27:04 -07:00
Victor Woeltjen
69dce9f88d [Info Bubble] Add clarifying comments
Add clarifying comments for the info gesture, WTD-884.
2015-05-22 13:25:39 -07:00
Victor Woeltjen
d9a2a7f4c3 [Info Bubble] Refine positioning, add comments
Refine positioning to behave correctly when mouse is on
right and/or lower part of screen; listen for scope
destruction to avoid cases where an element is removed
before mouseleave is ever called. WTD-884.
2015-05-22 13:22:26 -07:00
Victor Woeltjen
eafaa04c06 [Info Bubble] Add info gestures
Add info gestures to labels and grid items, WTD-884.
2015-05-22 12:51:42 -07:00
Victor Woeltjen
ab6a5afe93 [Info Bubble] Tweak positioning
Tweak positioning of info bubbles, WTD-884.
2015-05-22 12:50:09 -07:00
Victor Woeltjen
35f4032ae8 [Info Bubble] Fix display issues
Intermediary commit; fix some display issues with info bubbles,
add some delay. WTD-884.
2015-05-22 12:28:58 -07:00
Victor Woeltjen
05a78f70e3 [Info Bubble] Begin adding info gesture
Begin adding info gesture, which will attach info bubbles
to representations of domain objects. WTD-884.
2015-05-22 12:03:58 -07:00
Victor Woeltjen
179b0b46e5 [Info Bubble] Add info service
Add service for showing informational bubbles, WTD-884.
2015-05-22 11:49:02 -07:00
Victor Woeltjen
ac8fbb289e [Info Bubble] Continue breaking down templates
WTD-884.
2015-05-21 21:25:50 -07:00
Victor Woeltjen
cde173dbdc [Representation] Add test for scope clearing
Add test clearing to verify that scope gets cleared
on view changes, WTD-1182.
2015-05-20 16:39:49 -07:00
Victor Woeltjen
9b6d8cf1ec [Representation] Minimize scope reuse
When switching among domain objects and/or views, avoid
reusing the same information is scope. The wrong information
in scope can cause various failures in views, such as WTD-1182.
2015-05-20 16:26:53 -07:00
Victor Woeltjen
f74199e60f [Layout] Add check to view in frame
Add check to template for views in frame to avoid populating
frame prematurely; WTD-1182.
2015-05-20 14:02:56 -07:00
Victor Woeltjen
ce2b48981a [Windowing] Add in-line documentation
WTD-1200.
2015-05-20 10:06:59 -07:00
Victor Woeltjen
a937a3193b [Windowing] Show title of navigated object
Show title of navigated object in window, WTD-1200.
2015-05-20 09:57:04 -07:00
Victor Woeltjen
6ed14ed3a9 [Configuration] Deprioritize default constants
Mark ElasticSearch configuration constants as priority=fallback;
these are intended to be specified/overridden on a per-deployment
basis. WTD-1199.
2015-05-20 09:04:48 -07:00
Victor Woeltjen
4c720d97b7 [Licenses] Add server-side licenses
WTD-1051.
2015-05-13 16:47:13 -07:00
Victor Woeltjen
2ca789e36a [Licenses] Remove license ref from dialog
WTD-1051.
2015-05-13 16:44:57 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers
WTD-1051.
2015-05-13 16:43:30 -07:00
Victor Woeltjen
118d8481fb [Licenses] Update copyright years
WTD-1051.
2015-05-13 15:58:22 -07:00
Victor Woeltjen
c7b13b70d1 [Inspection] Begin decomposing bubble template
WTD-884.
2015-05-11 10:02:37 -07:00
Charles Hacskaylo
58bd4240f1 [Frontend] Merging warp1172 platform changes in
WTD-1172
(cherry picked from commit 219ffb4d59d4cc4a0172ba351af0e2b5d672d4b2)

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	warp/telemetry/src/autoflow/AutoflowTableLinker.js

Manually deleted AutoflowTableLinker.js
2015-05-07 13:10:04 -07:00
Charles Hacskaylo
2d13745823 [Frontend] Added CSS and markup for stale; cleanup
WTD-1172
Added stale CSS in _data-status.scss;
Added pulse animation in _effects.scss, not used;
Removed temp-limits directory and files;
Sanding and refining of limits styles and in .tabular;
2015-05-06 19:30:36 -07:00
Charles Hacskaylo
db74e2f84a [Frontend] CSS hooks for staleness
WTD-1172
New .scss file for staleness
Added CSS hooks in templates for staleness
2015-05-06 17:36:55 -07:00
Charles Hacskaylo
a244502f16 [Frontend] Adding missed CSS files
WTD-1172
2015-05-06 16:57:04 -07:00
Charles Hacskaylo
f114f742c4 [Frontend] Tweaks to markup and CSS
WTD-1172
scrolling.html markup and CSS hooks;
added comments to change points;
CSS tweaking;
2015-05-06 16:55:25 -07:00
Charles Hacskaylo
c8d06cb32a [Frontend] Limits added to fixed position view
WTD-1172
2015-05-06 11:20:09 -07:00
Charles Hacskaylo
4b774f7b12 [Frontend] Clean up
WTD-1172
Moved HTML limits markup out of plot.html and into temp-limits/.../examples.html
2015-05-06 10:34:16 -07:00
Charles Hacskaylo
39c8f0ab00 [Frontend] Plot limits and out-of-bounds indicators
WTD-1172
Markup and CSS for plots;
Example ng-class added to plot.html for legend items;
Markup added to plot.html for OOB indicators;
2015-05-06 10:21:29 -07:00
Victor Woeltjen
4c6cad3e77 Merge remote-tracking branch 'nasa/open1163' into open1176
WTD-1176
2015-05-06 10:11:01 -07:00
Charles Hacskaylo
fbaa0ff1e0 [Frontend] In-progress markup and CSS for limits
WTD-1172
Plot limits so far
2015-05-04 16:50:11 -07:00
Charles Hacskaylo
d21e320ec2 [Frontend] New version of symbols
WTD-1172
New version of symbols font with glyphs for limits display
2015-05-04 13:24:41 -07:00
Charles Hacskaylo
ac81968f93 [Frontend] CSS in Fixed Position view Edit mode
WTD-1163
WTD-1114
Added CSS to give a border to all elements in Fixed Position view when in Edit mode.
Only applied to outer element, does not affect object border styling;
2015-05-01 10:43:15 -07:00
Victor Woeltjen
ab60b92b9e Merge remote-tracking branch 'nasa/open1054' into open1162
Merge markup/styling for info bubble, WTD-1162
2015-05-01 10:33:16 -07:00
Charles Hacskaylo
6aadf921e1 [Frontend] Tweaks to spacing
WTD-1163
WTD-1146
2015-05-01 10:18:33 -07:00
Charles Hacskaylo
aec1176dc4 [Frontend] Hiding non-functional items; padding adjustments
WTD-1163
WTD-1146
New CSS to hide non-functional elements, including browse.top-bar with search elements;
Adjusted spacing, mainly in .contents CSS class;
2015-05-01 10:10:35 -07:00
Charles Hacskaylo
0bbe3ec99a [Frontend] CSS enhancements
WTD-1054
Better handling of different content cases;
2015-04-29 18:13:35 -07:00
Charles Hacskaylo
eafc603e03 [Frontend] Infobubble markup and CSS
WTD-1054
Markup and styling for infobubble;
Includes fake data in infobubble.html
2015-04-29 17:52:06 -07:00
Victor Woeltjen
2cba0234c5 [Pages] Add comments
Add comments to controller for Page objects in preparation
for integration, WTD-1158.
2015-04-29 15:05:46 -07:00
Victor Woeltjen
b2cd74e629 Merge branch 'open-master' into open1158 2015-04-29 15:02:57 -07:00
Charles Hacskaylo
ec2d5892a5 [Frontend] Markup for info bubble
WTD-1054
Temp object to allow work on markup for info bubble
2015-04-28 16:08:33 -07:00
Charles Hacskaylo
babe420f26 [Frontend] CSS and markup for iframe
WTD-1150
WTD-1145
CSS and markup to cause iframes to layout properly without double scroll bars
2015-04-28 14:49:08 -07:00
Charles Hacskaylo
582a236d8a [Frontend] Fixes, glyph and description updates
WTD-1150
WTD-1145
Fixed incorrect references to iFrameController to EmbeddedPageController;
Added new glyph for Page;
Renamed Page to Web Page;
2015-04-28 14:28:17 -07:00
Victor Woeltjen
617691ab24 Merge branch 'open806' into open-master 2015-04-27 15:16:21 -07:00
Victor Woeltjen
cab259415d [Pages] Test controller
Test controller for WTD-1145.
2015-04-27 14:58:32 -07:00
Victor Woeltjen
012fad6984 [Pages] Validate input
Valid URL input for Pages, WTD-1145.
2015-04-27 14:50:14 -07:00
Victor Woeltjen
01e2840aae [Pages] Move page plugin into platform
Move Page plugin from prototype location into
platform, WTD-1145.
2015-04-27 14:46:33 -07:00
Victor Woeltjen
a2bdeda1a0 Merge branch 'open1098' into open-master 2015-04-24 09:09:42 -07:00
Victor Woeltjen
4a4ef8c0f6 Merge branch 'open-master' into open806
Merge in latest in preparation for review of changes
for WTD-806
2015-04-20 19:35:19 -07:00
Victor Woeltjen
186ae05686 [Plot] Add test case
Add test case which exercises handling of historical telemetry,
WTD-806.
2015-04-20 17:04:34 -07:00
Victor Woeltjen
6400a670fa [Plot] Update plot with historical data
Trigger update of displayed plot data when new historical
data becomes available, WTD-806.
2015-04-20 17:00:30 -07:00
Victor Woeltjen
ffc122fb5c [Telemetry] Add test casese
Add test cases for general support for handling real-time telemetry,
WTD-806.
2015-04-20 16:51:08 -07:00
Victor Woeltjen
4d288950fd [Plot] Add test cases
Add test cases for plot line management, WTD-806.
2015-04-20 14:31:29 -07:00
Victor Woeltjen
e21cbbe2c6 [Plot] Add test cases
WTD-806
2015-04-20 11:00:54 -07:00
Victor Woeltjen
0242961e5a Merge remote-tracking branch 'nasa/open1036' into open1123 2015-04-17 17:02:20 -07:00
Victor Woeltjen
ffcd91f88d [Plot] Add test cases
Add test cases to spec for PlotUpdater to reflect changes
for merging streaming and historical data. WTD-806.
2015-04-17 16:55:49 -07:00
Victor Woeltjen
74b9d68dc8 [Plot] Update failing specs
Update failing specs after changes for WTD-806.
2015-04-17 16:42:15 -07:00
Victor Woeltjen
955c4209f0 [Plot] Add placeholder specs
Add placeholder specs for new scripts introduced to support
merging real-time and historical telemetry, WTD-806.
2015-04-17 15:11:22 -07:00
Victor Woeltjen
62958280b7 [Plot] Avoid clearing domain offset
Avoid clearing domain offset unnecessarily by fixing
variable reference; WTD-806.
2015-04-17 15:05:56 -07:00
Victor Woeltjen
8ba9c0553a [Plot] Begin integrating with telemetry handler
Miscellaneous tweaks and fixes to begin showing merged
real-time and historical telemetry, WTD-806.
2015-04-17 14:53:21 -07:00
Victor Woeltjen
5cc89e7983 [Plot] Update PlotController
Update plot controller to request historical telemetry,
WTD-806.
2015-04-17 14:09:39 -07:00
Victor Woeltjen
9f390de213 [Plot] Add clarifying comments
Add clarifying comments to PlotLine, added to simplify merging
of real-time with historical data, WTD-806.
2015-04-17 14:04:46 -07:00
Victor Woeltjen
7370b1a87f [Plot] Use new API from PlotUpdater
Use PlotLine and PlotLineBuffer from PlotUpdater, to enable
merging of real-time and historical telemetry. WTD-806.
2015-04-17 14:00:00 -07:00
Victor Woeltjen
4d34f19aa2 [Plot] Complete coverage of PlotLineBuffer
WTD-806.
2015-04-17 12:26:44 -07:00
Victor Woeltjen
6551e9212d [Plot] Fix insertion in PlotLineBuffer
WTD-806.
2015-04-17 12:13:17 -07:00
Victor Woeltjen
b20643018a [Plot] Complete PlotLineBuffer
Complete implementation of PlotLineBuffer, which is responsible
for managing the displayable buffer for an individual plot line.
WTD-806.
2015-04-17 12:06:44 -07:00
Victor Woeltjen
15b1c824e3 [Plot] Begin separating out plot line handling
Begin separating out plot line buffer from the rest of plot;
managing this buffer separately will aid in merging realtime
and hsitorical data, WTD-806.
2015-04-17 11:35:24 -07:00
Victor Woeltjen
9215eb1427 [Plot] Begin updating plot
Begin updating plot to merge realtime and historical
telemetry, WTD-806.
2015-04-16 16:48:03 -07:00
Victor Woeltjen
03e1633a22 [Timeline] Track realtime index in updater
Track realtime index in PlotUpdater to facilitate prepending of
historical data portion on-demand, WTD-806.
2015-04-16 16:41:09 -07:00
Victor Woeltjen
60e888e16e [Telemetry] Begin adding telemetry handler
Begin adding a general purpose handler for telemetry which
extends on the behavior associated with the telemetrySubscriber
by supporting access to historical data as well. WTD-806.
2015-04-16 16:27:25 -07:00
Victor Woeltjen
774c4dec1d [Telemetry] Separate out delegator
Separate out handling of delegation related to telemetry,
WTD-806.
2015-04-16 16:01:51 -07:00
Charles Hacskaylo
06a887a96e [Content/Dev] Licenses generator and content
WTD-1036
Added file to gen LICENSES.md content;
Added LICENSES.md file to repo
2015-04-16 15:16:00 -07:00
Charles Hacskaylo
b4cabbb4af [Frontend] Added dynamic plurality to "author" field label
WTD-1036
If licenses/author node in *bundle.json includes a comma,
display authors instead of author as the label
2015-04-15 17:46:11 -07:00
Charles Hacskaylo
b6503489b9 [Frontend] Major reformatting of /licenses page
WTD-1036
Major additions to /licenses page
Apache license added;
Full licenses for each software component added;
Formatting and styles;
2015-04-15 17:40:12 -07:00
Charles Hacskaylo
dbe27d2842 [Frontend/Content] Copy and styling tweaks
WTD-1036
Open source copyright information added to about-dialog.html;
Styling for a and h2 elements tweaked;
2015-04-15 14:40:38 -07:00
Victor Woeltjen
036722b275 [Containment] Disallow composition in immutable objects
Disallow composition in objects which cannot be created, under
the rationale that creatable objects must also be immutable.
WTD-1098.
2015-04-10 19:24:16 -07:00
Victor Woeltjen
a55f8e1ab5 [Containment] Test compose action policy
Test compose action policy, which prevents the 'compose' action
when composition rules would be violated. WTD-962.
2015-04-10 18:39:57 -07:00
Victor Woeltjen
c59f13504e [Containment] Test containment tables
Test tables which support efficient lookup of composition policy,
WTD-962.
2015-04-10 18:29:42 -07:00
Victor Woeltjen
e3a44356a8 [Containment] Test composition policy
WTD-962.
2015-04-10 18:16:40 -07:00
Victor Woeltjen
90b8f22c2d [Containment] Add skeleton specs
Add empty specs for composition policy, WTD-962.
2015-04-10 18:09:02 -07:00
Victor Woeltjen
db57444738 [Containment] Update specs for coverage
Update existing specs for code coverage after changes for
WTD-962, composition policy.
2015-04-10 18:00:13 -07:00
Victor Woeltjen
fa5bc326e1 [Containment] Update failing specs
Update failing specs after changes for composition
policy to enforce containment rules, WTD-962.
2015-04-10 17:47:49 -07:00
Victor Woeltjen
3e972650c7 [Containment] Test LinkAction
Add test cases for LinkAction, added to allow composition
changes to be controlled by policy. WTD-962.
2015-04-10 17:37:11 -07:00
Victor Woeltjen
f6df73c11b Merge branch 'open-master' into open962
Merge in latest from open-master into topic branch
for WTD-962
2015-04-10 17:30:03 -07:00
Victor Woeltjen
952f380c33 [Containment] Make ngModel optional
Make the ngModel dependency of mct-control optional, to avoid
breaking mct-control usages which don't also use ng-model.
WTD-962.
2015-04-09 13:10:27 -07:00
Victor Woeltjen
79f6e8c082 Merge branch 'open1062' into open-master
Merge changes for WTD-1062
2015-04-08 12:48:49 -07:00
Victor Woeltjen
9d3c22655d Merge branch 'open973' into open-master
Merge in policy service, WTD-973

Conflicts:
	bundles.json
2015-04-08 12:43:13 -07:00
Victor Woeltjen
3707a68ea1 Merge branch 'open1071' into open-master
Merge changes for WTD-1071
2015-04-08 12:38:17 -07:00
Victor Woeltjen
c8ec3e713d Merge branch 'open1070' into open-master
Merge in changes for WTD-1070
2015-04-08 12:34:45 -07:00