Dave
d343d38037
Merge remote-tracking branch 'upstream/master'
2015-07-01 13:30:08 -07:00
Shivam Dave
73241efdc8
[Fix] Fixes bundle
...
Changes the persistance to the example
version.
2015-06-30 13:20:46 -07:00
Victor Woeltjen
5f80fcabc6
[Imagery] Clear background image
...
Clear background image on change, WTD-1407.
2015-06-29 18:49:36 -07:00
Victor Woeltjen
397a545482
[Plot] Expand range to give margin for points
...
Expand range to give some margin for points near the edge,
WTD-1406.
2015-06-29 18:08:03 -07:00
Victor Woeltjen
fa8095d5bc
Merge branch 'open-master' into open1317limits2
...
WTD-1405
Conflicts:
platform/features/layout/res/templates/elements/telemetry.html
2015-06-29 17:30:33 -07:00
Victor Woeltjen
1c4cca3f91
Merge branch 'open1392b' into open-master
2015-06-29 16:30:48 -07:00
Victor Woeltjen
ef77ca91e7
Merge branch 'open1363' into open-master
2015-06-29 16:27:10 -07:00
Victor Woeltjen
970698c77b
Merge remote-tracking branch 'nasa/open1392' into open1392b
...
Conflicts:
platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
2015-06-29 16:09:01 -07:00
Victor Woeltjen
0b4aa730f4
Merge pull request #30 from slhale/open26
...
[Events] Create tests for real time version
2015-06-29 15:42:33 -07:00
Victor Woeltjen
87f982b03e
Merge remote-tracking branch 'nasa/open-master' into open-master
2015-06-29 15:10:02 -07:00
Victor Woeltjen
29283e4fb5
Merge branch 'open1233' into open-master
2015-06-29 15:09:40 -07:00
larkin
cc64412d78
Merge remote-tracking branch 'origin/open1344' into open-1348
2015-06-29 14:58:27 -07:00
larkin
52cf918d08
Merge remote-tracking branch 'origin/open1317' into open-1346
2015-06-29 14:44:24 -07:00
Sarah Hale
2ab3932ce1
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-29 14:43:19 -07:00
Charles Hacskaylo
a7c90f2476
[Frontend] platform-specific changes to CSS, fonts and markup
...
WTD-1392
WTD-1360
WTD-1394
New minus symbol added to font;
Updated folder symbols art;
CSS tweaked for reset button (WTD-1394) and direction sign;
Font project file updated;
(cherry picked from commit f6c7d8e)
2015-06-29 14:39:46 -07:00
Sarah Hale
f816b5018a
[Events] Style
...
Removed unused variables. #26 .
2015-06-29 13:15:56 -07:00
Victor Woeltjen
ebbac233aa
Merge branch 'open1373' into open-master
2015-06-29 13:15:43 -07:00
Sarah Hale
b91b197f5b
[Events] Comments
...
Removed todo comment. #26 .
2015-06-29 13:14:51 -07:00
Sarah Hale
14694c675b
[Events] All tests work
...
All of the tests for the RT Events are working. #26 .
2015-06-29 13:13:05 -07:00
Sarah Hale
56c3e72d32
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-29 13:10:46 -07:00
Sarah Hale
6616dedf63
[Events] Controller test correction
...
Test for the RT Event List controller now
actually works. #26 .
2015-06-29 13:09:15 -07:00
larkin
38ad8058e8
Merge remote-tracking branch 'origin/open1223' into open-1338
...
Resolve merge conflicts due to whitespace changes.
2015-06-29 12:08:16 -07:00
Victor Woeltjen
66f8ee7194
[Common UI] Fix min/max bounds of mct-split-pane
...
WTD-1363. Use correct dimension (width or height)
when determining maximum splitter position.
2015-06-29 11:54:40 -07:00
larkin
84345caf7d
[Style] Convert tabs to spaces
2015-06-29 11:51:28 -07:00
Victor Woeltjen
b524dc451f
[Common UI] Remove unused function
...
Remove obsolete function from mct-split-pane, WTD-1363
2015-06-29 11:27:48 -07:00
Charles Hacskaylo
c262fe814c
[Frontend] Added pointer-events: none
...
WTD-1363?
2015-06-29 11:08:28 -07:00
Sarah Hale
4c6b3c7a13
[Events] Policy test correction
...
The view policy test for real time Messages
actually now works. #26 .
2015-06-29 09:56:59 -07:00
Sarah Hale
d120c8b139
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-29 09:10:23 -07:00
Victor Woeltjen
762f4d59fc
[Layout] Disallow folders
...
Disallow layouts in folders, WTD-1373.
2015-06-27 12:43:32 -07:00
Victor Woeltjen
12b34b5d58
Merge pull request #27 from shivamndave/open25
...
Addresses #25
2015-06-27 12:26:15 -07:00
Victor Woeltjen
a752a21bf8
Merge branch 'open-master' into open1388
2015-06-27 12:17:45 -07:00
Victor Woeltjen
8c5b497377
[Common UI] Tweak mct-split-pane
...
Tweak mct-split-pane for use in timeline; particularly,
improve synchronization between views. WTD-1363.
2015-06-27 11:59:18 -07:00
Victor Woeltjen
a0d5a1a196
[Common UI] Get split pane width from elements
...
WTD-1363.
2015-06-27 10:46:42 -07:00
Victor Woeltjen
c79b018c84
[Common UI] Remove obsolete checks
...
Remove obsolete minimum/maximum checks, WTD-1363.
2015-06-27 10:40:05 -07:00
Victor Woeltjen
a1eb15db77
[Common UI] Change min/max width handling in splitter
...
In split pane, obey the min-width and max-width style properties
of first element within the pane. WTD-1363.
2015-06-27 10:35:49 -07:00
Charles Hacskaylo
8841f25186
[Frontend] Create menu style normalized
...
WTD-1392
WTD-1367
WTD-1391
Some significant reorging in _menus.scss and _constants;
Create menu normalized with context menu styles;
Bottom bar of overlay overflow set to visible to prevent button clipping;
2015-06-26 18:38:33 -07:00
Charles Hacskaylo
e3cb9dae5a
[Frontend] Bottom bar restyled
...
WTD-1392
WTD-1362
Fixed font size in botttom bar;
Added font-smoothing to global.scss;
Bottom bar design restyled;
2015-06-26 17:12:24 -07:00
Victor Woeltjen
72c812cdaa
[Common UI] Enforce split pane min/max
...
WTD-1363.
2015-06-26 16:30:39 -07:00
Victor Woeltjen
39372ea9ca
[Common UI] Use mct-split-pane in Browse
...
WTD-1363.
2015-06-26 16:21:20 -07:00
Victor Woeltjen
0ee76421e0
[Common UI] Add mct-splitter
...
WTD-1363.
2015-06-26 15:59:16 -07:00
Charles Hacskaylo
83be455b0b
[Frontend] Added user-select: none to .btn, .l-btn class
...
WTD-1392
WTD-1074
2015-06-26 15:52:07 -07:00
Charles Hacskaylo
50bf7b7b32
[Frontend] Removed crosshair cursor from image class
...
WTD-1392
WTD-1371
2015-06-26 15:38:38 -07:00
Charles Hacskaylo
0fd1fb709b
[Config] Fix for priority of New Tab button
...
WTD-1392
WTD-1359
Set "Open in new tab" button to have priority "preferred";
Set fullscreen mode button to priority "default";
Tweaked full screen button tooltip text;
2015-06-26 15:36:55 -07:00
Victor Woeltjen
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
larkin
e582092844
[Comments] Add missing space
2015-06-26 15:23:22 -07:00
Sarah Hale
4e03d7b29b
[Events] RT Messages policy test
...
The view policy test for real time Messages
now works. #26 .
2015-06-26 15:17:17 -07:00
larkin
d729cfcd3e
Merge remote-tracking branch 'origin/open1329' into open1343
2015-06-26 15:13:21 -07:00
larkin
f9782f1f45
Merge remote-tracking branch 'origin/open1273' into open-1340
2015-06-26 15:03:19 -07:00
Sarah Hale
41e75d7494
[Events] EventListController test
...
Test for the Event List controller now works. #26 .
2015-06-26 14:59:04 -07:00
Sarah Hale
95f9d783d3
[Events] Column tests working
...
Tests for the domain and range columns now work
for the real time event list. #26 .
2015-06-26 14:23:41 -07:00
