Commit Graph

1135 Commits

Author SHA1 Message Date
larkin
270cb48db0 Merge remote-tracking branch 'origin/open1256' into open-1336 2015-06-25 12:44:23 -07:00
larkin
ffc2d98914 Merge remote-tracking branch 'origin/open1241' into open-1335 2015-06-25 12:35:19 -07:00
Victor Woeltjen
bd5ba48270 Merge remote-tracking branch 'github/master' into open-master 2015-06-25 12:05:34 -07:00
Victor Woeltjen
3df12788f9 Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 11:53:13 -07:00
Charles Hacskaylo
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
larkin
abaca86290 Merge remote-tracking branch 'origin/open1291' into open-1330 2015-06-25 11:30:33 -07:00
larkin
6c3aeb2784 [Comments] Comment matches exported name 2015-06-25 11:19:01 -07:00
larkin
a3f3f5bb27 Merge remote-tracking branch 'origin/open1170' into open-1318 2015-06-25 11:06:44 -07:00
Victor Woeltjen
70f5a001ee Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 10:06:18 -07:00
Victor Woeltjen
d3ff49b90b Merge remote-tracking branch 'nasa/open1319' into open1320 2015-06-25 09:59:23 -07:00
Victor Woeltjen
25d3a4d8c2 Merge remote-tracking branch 'nasa/open1323' into open1324 2015-06-25 09:25:42 -07:00
Victor Woeltjen
9ac6abe78f Merge remote-tracking branch 'nasa/open980' into open1342 2015-06-25 09:07:27 -07:00
Charles Hacskaylo
9f137513d9 Merge branch 'open-master' of https://trunk.arc.nasa.gov/git/wtd into open1341 2015-06-24 19:25:27 -07:00
Charles Hacskaylo
19748ba17c [Dev/Frontend] Cherry-picking platform changes from warp1341
WTD-1341
Re-rendered css file;
2015-06-24 18:56:38 -07:00
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341
WTD-1341
2015-06-24 18:55:15 -07:00
Charles Hacskaylo
e357df2fe5 [Dev/Frontend] Cherry-picking platform changes from warp1341
WTD-1341
2015-06-24 18:52:52 -07:00
Victor Woeltjen
889ca79c5e Merge pull request #21 from shivamndave/open16
Addresses #16
2015-06-24 16:30:09 -07:00
Shivam Dave
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
Charles Hacskaylo
6a96f1d395 [Frontend] Added icomoon.io project file 2015-06-24 13:54:57 -07:00
Charles Hacskaylo
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
Shivam Dave
c827c40c03 [Windowing] used
Used  instead of window in the
NewTabAction. WTD 16.
2015-06-24 12:58:48 -07:00
Shivam Dave
c606055a3b [Windowing] Format
Slight formatting change.
WTD 16.
2015-06-24 12:54:49 -07:00
Shivam Dave
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
Shivam Dave
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
Charles Hacskaylo
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
Shivam Dave
8926d4b2fb Merge remote-tracking branch 'upstream/master' into open16 2015-06-24 11:34:33 -07:00
Shivam Dave
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
Victor Woeltjen
47647f4ada Merge remote-tracking branch 'nasa/open-master' into open-master 2015-06-24 10:06:10 -07:00
Victor Woeltjen
1dbd6fc868 Merge pull request #20 from nasa/open14
[Frontend] Fix to prevent infobubbles from preventing clicks
2015-06-24 10:05:16 -07:00
Sanderfer
f617a01a4d Ticket WTD-1315
Merge branch 'open-master' into open475
2015-06-24 09:56:08 -07:00
Shivam Dave
83cc0b65d5 [Windowing] Comments
Added comments to files. WTD-16.
2015-06-23 16:35:34 -07:00
Shivam Dave
61d9545414 [Windowing] UrlService
UrlService added which takes in a
mode (browse or edit), and also a
domainObject. Returns the url
path to that domainObject. WTD-16.
2015-06-23 16:11:06 -07:00
Charles Hacskaylo
db3e132799 [Frontend] New symbols font and CSS adjustments, in-progress
WTD-980
WTD-396
2015-06-23 16:07:29 -07:00
Shivam Dave
21462bf60d [Windowing] View Set
Sets the view to bethe current
page's view mode. WTD-16.
2015-06-23 15:39:48 -07:00
Shivam Dave
29efb5cf3b [Windowing] Selected Object
Uses the context to get the selected object
or the navigated object. This allows contextual
menu new tab access from the tree. WTD-16.
2015-06-23 13:32:09 -07:00
Victor Woeltjen
dc4ce59dbd Merge branch 'open-master' into open1256 2015-06-23 13:14:17 -07:00
Victor Woeltjen
30e51e783e [Core] Add JSDoc
Add JSDoc to decorator which provides missing models,
WTD-1241.
2015-06-23 13:03:17 -07:00
Victor Woeltjen
14fbd64ae4 Merge branch 'open-master' into open1241
Merge latest from master branch into topic branch
for WTD-1241.
2015-06-23 13:00:27 -07:00
Shivam Dave
e55cd88d38 [Windowing] View
Includes the view using the
.search().view to find
the view key and append that to the
end of the url. Prints this out using
the alert window. WTD-16.
2015-06-23 11:38:01 -07:00
Victor Woeltjen
e4db4d3802 Merge branch 'open-master' into open1291
Merge in latest from master branch into topic branch
for WTD-1291.
2015-06-23 11:33:27 -07:00
Shivam Dave
e38ad7b082 [Windowing] Path Alert
Alerts user of the current path
using an alert window, however
the path is partially shown.
It is the part of the current
path after index.html#. WTD-16.
2015-06-23 11:05:00 -07:00
Charles Hacskaylo
c35c9c43b7 [Frontend] Tweak size of spinner
WTD-1323
2015-06-22 18:47:58 -07:00
Charles Hacskaylo
cb715a9d48 [Frontend] Merge in platform CSS changes
WTD-1319
WTD-768
WTD-841
Change CSS for autoflow-tabular header;
2015-06-22 18:41:04 -07:00
Shivam Dave
d5a9019493 [Windowing] Comment Adjusted
Changed window to tab in comments in
file. WTF-16.
2015-06-22 15:54:32 -07:00
Shivam Dave
1c445e1ce3 [Windowing] New Tab Adjustment
Added NewTabAction to spec file and adjusted
it to new name. Also changed comment in
NewTabAction along with a code fix.
WTD-16.
2015-06-22 15:44:09 -07:00
Shivam Dave
c7154447e2 [Windowing] Tabbing Rename
Renamed all instances of NewWindow to be
NewTab instead. WTD-16.
2015-06-22 15:35:08 -07:00
Shivam Dave
dc4436e890 [Windowing] Unit Test Adjustment
Added comments to the NewWindowActionSpec.js
file. WTD-16.
2015-06-22 15:15:46 -07:00
Shivam Dave
02265c82d6 [Windowing] Unit Test
Completes Unit Test. Added a new file:
NewWindowActionSpec.js, which performs the
Jasmine test for NewWindowAction.js. The
test specifies a mockWindow with a mockUrl
and then adds both to a NewWindowAction.
Also suite.json contains the NewWindowActon
path. In order for NewWindowAction.jsWTD-16.
to be reached. WTD-16.
2015-06-22 15:10:55 -07:00
Shivam Dave
fd1c847e2c [Windowing] Remove Varibale
Removed the variable currentUrl because it
was not needed. WTD-16.
2015-06-22 15:06:12 -07:00
Shivam Dave
546af71263 Merge remote-tracking branch 'upstream/master' into open16 2015-06-22 14:06:40 -07:00