f9782f1f45
Merge remote-tracking branch 'origin/open1273' into open-1340
2015-06-26 15:03:19 -07:00
2161707954
Merge pull request #24 from shivamndave/open23
...
Addresses #23
2015-06-26 12:41:43 -07:00
c655b16f9e
Merge pull request #22 from slhale/open18
...
Open18
2015-06-26 11:44:04 -07:00
2a347f1596
[Windowing] urlService
...
Removed the urlService from the edit
and browse bundles. Added the urlService
to the general bundle. WTD 23.
2015-06-25 14:53:52 -07:00
bf8b0bae03
Merge branch 'master' of https://github.com/nasa/openmctweb into open18
2015-06-25 14:51:18 -07:00
193df4fde3
[Windowing] Excess function
...
Removed extra function from
urlService. WTD 23.
2015-06-25 14:37:01 -07:00
c98a381a42
[Events] Created RT Messages
...
Created a real-time version of the Messages view called
RT Messages.
Additionally, fixed the MessagesViewPolicy test. #18 .
2015-06-25 14:36:14 -07:00
3d0e0af7f2
[Windowing] Remove variable
...
Excess variable used for CancelAction's
ReturnToBrowse. WTD 23.
2015-06-25 14:28:38 -07:00
5ba0f9d7a1
Merge remote-tracking branch 'upstream/master' into open23
2015-06-25 14:08:46 -07:00
3a371483ab
[Windowing] urlService
...
Added the urlService to the unit
tests for the cancel and save buttons
also removed unused services. WTD 23.
2015-06-25 14:07:02 -07:00
6d28add055
[Windowing] urlService
...
urlService added to the edit action
bundle.json in addition to being
implemented, however 2nd time edit
bug still occurring. Also fixed urlService
test suite. WTD 23.
2015-06-25 13:16:15 -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
abaca86290
Merge remote-tracking branch 'origin/open1291' into open-1330
2015-06-25 11:30:33 -07:00
a3f3f5bb27
Merge remote-tracking branch 'origin/open1170' into open-1318
2015-06-25 11:06:44 -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
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
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
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
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
c606055a3b
[Windowing] Format
...
Slight formatting change.
WTD 16.
2015-06-24 12:54:49 -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
adc4a1b828
[Events] Tweaked tests
...
Changed some test names to be more descriptive.
Moved the policy test to another folder.
Blanket coverage now works. #18 .
2015-06-24 12:11:04 -07:00
fdfa35d1da
[Frontend] New symbols font and CSS adjustments
...
WTD-980
WTD-396
Changed glyph for stacked plots;
Normalized button line-heights and size of required symbol;
Updated symbol art in symbols font;
Restored mistakenly removed "menu" gesture to grid-item;
2015-06-24 11:42:29 -07:00
8926d4b2fb
Merge remote-tracking branch 'upstream/master' into open16
2015-06-24 11:34:33 -07:00
43cfab1031
[Windowing] Unit Test
...
Unit Tests for UrlService and NewTabAction
created and partially written. UrlService
returns 100% and NewTabAction returns 88%.
WTD 16.
2015-06-24 11:32:59 -07:00
ff8e6f40bb
[Events] More style
...
Edited comments to clarify the sources of
files. #18 .
2015-06-24 11:32:13 -07:00
