e17b6c5a92
Merge branch 'open-master' into open1317limits
2015-06-25 12:45:03 -07:00
270cb48db0
Merge remote-tracking branch 'origin/open1256' into open-1336
2015-06-25 12:44:23 -07:00
ffc2d98914
Merge remote-tracking branch 'origin/open1241' into open-1335
2015-06-25 12:35:19 -07:00
bd5ba48270
Merge remote-tracking branch 'github/master' into open-master
2015-06-25 12:05:34 -07:00
3df12788f9
Merge remote-tracking branch 'nasa/open1341' into open1345
2015-06-25 11:53:13 -07:00
685e384858
[Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection
...
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
2015-06-25 11:46:15 -07:00
61fe77cc17
[Drag-Drop] Add test cases
...
Add test cases for avoiding redundant drop handling,
WTD-1233.
2015-06-25 11:35:18 -07:00
abaca86290
Merge remote-tracking branch 'origin/open1291' into open-1330
2015-06-25 11:30:33 -07:00
6f3d6ec12f
[Drag-Drop] Prevent redundant drops
...
Mark default as prevented and check for prevention of
default when handling mctDrop events (which allow
views to follow up on drop gestures by positioning
objects within themselves) avoiding redundant drops
into embedded views. WTD-1233.
2015-06-25 11:27:58 -07:00
6c3aeb2784
[Comments] Comment matches exported name
2015-06-25 11:19:01 -07:00
a3f3f5bb27
Merge remote-tracking branch 'origin/open1170' into open-1318
2015-06-25 11:06:44 -07:00
482f355a08
[Fixed Controller] Stop tracking bounds
...
Stop tracking size of a fixed position view; no longer
necessary now that background grid is handled by CSS.
Change made in the context of WTD-1344.
2015-06-25 11:00:15 -07:00
9e55befb2a
[Fixed Controller] Add test cases
...
Add test cases for updating position of elements in
a fixed position view, WTD-1344.
2015-06-25 10:58:01 -07:00
4279c9e4bf
[Fixed Position] Remove obsolete cell styles
...
Remove obsolete cell style calculations; background
grid is handled by CSS now. Changed in the context of
WTD-1344.
2015-06-25 10:48:49 -07:00
791504584d
[Fixed Position] Update positions when grid size changes
...
Update positions of elements in a fixed position
view when grid size changes (e.g. when switching
from one domain object to another.) WTD-1344.
2015-06-25 10:45:50 -07:00
fd6459394a
[Windowing] urlService
...
Changed folder location of
services and therefore urlService
to general/src/ instead of being in
browse/src/. WTD 23.
2015-06-25 10:38:39 -07:00
93ba4ce715
[Windowing] Unit Test
...
Added Unit test adjustments for
the change in urlService (addition
of a separate function for getting
the url for a location, used by browse
controller. WTD 23.
2015-06-25 10:10:13 -07:00
70f5a001ee
Merge remote-tracking branch 'nasa/open1341' into open1345
2015-06-25 10:06:18 -07:00
c6405c50df
Merge branch 'master' of https://github.com/nasa/openmctweb into open18
2015-06-25 10:00:21 -07:00
1961ba20c0
Fixing merge
...
Re-added the tests.
2015-06-25 09:59:52 -07:00
d3ff49b90b
Merge remote-tracking branch 'nasa/open1319' into open1320
2015-06-25 09:59:23 -07:00
288692f57c
Fixing merge
...
Re-added the event list controller.
2015-06-25 09:57:43 -07:00
a993ee6126
Fixing conflicts
2015-06-25 09:48:09 -07:00
ca6f44f7b6
[Windowing] URL Fix
...
The URL malformation was caused by the same
function returning the view and index path for
both the newtab window and the browse controller
window. As a result, the BrowseController now only
uses a path that excludes the view and index paths,
like before the UrlService was added. Another,
separate function uses this url for the location
and includes the view and index paths for new
tabs, in order to maintain the current view. WTD 23.
2015-06-25 09:47:58 -07:00
163b210fbb
[Events] Real-time telemetry version
...
Creating an additional event list which can handle real
time data, not historical data. #18 .
2015-06-25 09:39:29 -07:00
f6298c162c
[Events] Real-time telemetry version
...
Creating an additional event list which can handle real
time data, not historical data. #18 .
2015-06-25 09:27:24 -07:00
25d3a4d8c2
Merge remote-tracking branch 'nasa/open1323' into open1324
2015-06-25 09:25:42 -07:00
9ac6abe78f
Merge remote-tracking branch 'nasa/open980' into open1342
2015-06-25 09:07:27 -07:00
40957b1c29
[Scrolling List] Enforce row count
...
WTD-1317
2015-06-25 08:50:44 -07:00
9f137513d9
Merge branch 'open-master' of https://trunk.arc.nasa.gov/git/wtd into open1341
2015-06-24 19:25:27 -07:00
19748ba17c
[Dev/Frontend] Cherry-picking platform changes from warp1341
...
WTD-1341
Re-rendered css file;
2015-06-24 18:56:38 -07:00
52a7bd1033
[Dev/Frontend] Cherry-picking platform changes from warp1341
...
WTD-1341
2015-06-24 18:55:15 -07:00
e357df2fe5
[Dev/Frontend] Cherry-picking platform changes from warp1341
...
WTD-1341
2015-06-24 18:52:52 -07:00
a7c09f8c79
[Scrolling List] Add realtime scrolling list
...
Add realtime scrolling list view, for compatibility
with realtime-only data. WTD-1317.
2015-06-24 18:10:59 -07:00
d2fe71d82b
[Events] Fixed tabs
...
Removed tabs from EventListController and replaced
with spaces. #18 .
2015-06-24 17:08:03 -07:00
203de023d2
[Events] More general view policy
...
The Messages view policy now will allow any object
that has a telemetry type of string to have access
to the Messages view, not just Event List
Generators. (The test for this still does not work
though.) #18 .
2015-06-24 17:05:14 -07:00
889ca79c5e
Merge pull request #21 from shivamndave/open16
...
Addresses #16
2015-06-24 16:30:09 -07:00
fd81c5c859
[Events] No Period
...
No longer asks for a period when creating a
new Event Message Generator. #18 .
2015-06-24 15:19:47 -07:00
bd9010e2bc
[urlService] CleanUp/Refactor
...
Adjusted BrowseController's useRoute
to use the urlService instead. Also
adds urlService as a depency through
bundle. Unit test also adjusted to
account for a mockUrlService and
a different value being passed into
mockLocation.path(). WTD 16.
2015-06-24 14:06:09 -07:00
6a96f1d395
[Frontend] Added icomoon.io project file
2015-06-24 13:54:57 -07:00
14a83e143c
[Frontend] New symbols font and CSS adjustments
...
WTD-980
WTD-396
Minor sanding and shimming;
Updated symbols;
Create super-menu now uses key color;
Removed unused wtdsymbols-v2* font files;
2015-06-24 13:39:31 -07:00
befbcab892
[Telmetry] Add test cases
...
Add test cases for TelemetrySubscription related to listening
for mutation, to support views of domain objects which delegate
telemetry, for WTD-1329.
2015-06-24 13:25:07 -07:00
360c3fcf15
[Telemetry] Update specs
...
Update specs to reflect changes for WTD-1329.
2015-06-24 13:17:42 -07:00
10e47e6f48
[Events] Fixed comments
...
Fixed comments to refer to event lists
correctly. #18 .
2015-06-24 13:14:19 -07:00
c827c40c03
[Windowing] used
...
Used instead of window in the
NewTabAction. WTD 16.
2015-06-24 12:58:48 -07:00
bcfe80fbdc
[Plot] Handle changes to telemetry objects
...
Handle changes to the set of visible telemetry objects
in a plot; addresses WTD-619, which is related to WTD-1329.
2015-06-24 12:54:49 -07:00
c606055a3b
[Windowing] Format
...
Slight formatting change.
WTD 16.
2015-06-24 12:54:49 -07:00
f2df0bfdbb
[Core] Expose 'topic' service
...
Expose 'topic' services, which supports updating telemetry
subscriptions on mutation for WTD-1329.
2015-06-24 12:53:43 -07:00
6863af9cd9
[Windowing] Comment/Formatting
...
Reformatted code and added comments
to the unit test. Also refined the
NewTabActionSpec unit test to be
clearer. WTD 16.
2015-06-24 12:50:21 -07:00
13eef59e4f
[Windowing] Unit Test
...
Added mockContext to
UrlServiceSpec unit test
in order to reach the
domainObject's context
capability. WTD 16.
2015-06-24 12:31:40 -07:00
