39372ea9ca
[Common UI] Use mct-split-pane in Browse
...
WTD-1363.
2015-06-26 16:21:20 -07:00
0ee76421e0
[Common UI] Add mct-splitter
...
WTD-1363.
2015-06-26 15:59:16 -07:00
83be455b0b
[Frontend] Added user-select: none to .btn, .l-btn class
...
WTD-1392
WTD-1074
2015-06-26 15:52:07 -07:00
50bf7b7b32
[Frontend] Removed crosshair cursor from image class
...
WTD-1392
WTD-1371
2015-06-26 15:38:38 -07:00
243c832c25
[Common UI] Add mct-split-pane
...
Add mct-split-pane directive, to simplify adding splitters.
WTD-1363.
2015-06-26 15:32:37 -07:00
f9782f1f45
Merge remote-tracking branch 'origin/open1273' into open-1340
2015-06-26 15:03:19 -07:00
f8f2019dad
Merge remote-tracking branch 'nasa/open1322' into open1388
2015-06-26 13:25:12 -07:00
2161707954
Merge pull request #24 from shivamndave/open23
...
Addresses #23
2015-06-26 12:41:43 -07:00
fce327a398
[Dev/Frontend] New symbol added to symbols font
...
WTD-1322
Platform-only commit;
(cherry picked from warp1322 commit 7254013)
2015-06-25 15:17:08 -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
5ba0f9d7a1
Merge remote-tracking branch 'upstream/master' into open23
2015-06-25 14:08:46 -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
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
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
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
d3ff49b90b
Merge remote-tracking branch 'nasa/open1319' into open1320
2015-06-25 09:59:23 -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
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
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
db3e132799
[Frontend] New symbols font and CSS adjustments, in-progress
...
WTD-980
WTD-396
2015-06-23 16:07:29 -07:00
d6a31dcef3
[Plot] Update failing specs
...
Update failing specs for changes related to fixed duration
plots, WTD-1273.
2015-06-23 14:17:28 -07:00
c35c9c43b7
[Frontend] Tweak size of spinner
...
WTD-1323
2015-06-22 18:47:58 -07:00
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
683a733ae1
[Windowing] SASS Edit
...
Adjusted the SASS file to
not hide the new window button. Also
removed the overwrite metadata function
that was used to temprarily allow us to
view the new window button. WTD-16.
2015-06-22 14:00:25 -07:00
0feb3b0462
Merge branch 'open18' of https://github.com/slhale/openmctweb into open18
2015-06-22 12:37:15 -07:00
7f7759f72c
Merge branch 'open-master' into open1223
2015-06-20 15:36:21 -07:00
8199d1d9d9
[Plot] Use mct-drag from plot
...
Use mct-drag from plot such that we are able to handle
mouse events which leave the plot area for marquee zoom
and pan. WTD-1273.
2015-06-20 11:47:10 -07:00
6b0a77d131
Merge pull request #8 from nasa/open1149
...
[Addressability] Use/populate URL
2015-06-19 16:05:10 -07:00
149ac44e8c
Merge pull request #13 from nasa/open12
...
[Execution] Add worker service
2015-06-19 16:05:02 -07:00
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
3b62add011
Merge branch 'open-master' into open1223
...
Conflicts:
platform/features/plot/res/templates/plot.html
2015-06-19 13:34:21 -07:00
dbd7a65a7a
Merge remote-tracking branch 'nasa/open1295' into open-master
2015-06-18 18:33:09 -07:00
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
dc85d3c191
Merge pull request #4 from nasa/open884
...
[Info Bubble] Add info bubble
2015-06-17 11:47:34 -07:00
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
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
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
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
c428df524c
Merging in open1248, resolve conflicts
2015-06-16 14:07:53 -07:00
4887ba0e58
Merge in open-master, resolve conflicts
2015-06-16 13:53:00 -07:00
