ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-09 06:22:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,168 Commits 992 Branches 212 Tags 192 MiB
e67a2e63cf
Commit Graph

873 Commits

Author SHA1 Message Date
Victor Woeltjen
dbe1875e70 [Themes] Resolve conflicts 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
 2015-09-22 16:12:44 -07:00
Pete Richards
aba0969312 Merge branch 'mobile-integration' into open-master 2015-09-22 13:53:22 -07:00
Pete Richards
2040304980 Merge remote-tracking branch 'github-open/open19' into open-master 2015-09-22 13:49:41 -07:00
Pete Richards
8b7a94dcf8 [Style] Remove unused variables, excess whitespace 
Clean up unused variables and excess whitespace to match style guide.
 2015-09-22 11:14:55 -07:00
Pete Richards
3e5d294a28 [SCSS] Fixed typo 
Changed tmpBorder mixin to specify '@include' instead of '@iclude'.  This
does not change the output CSS which means the tmpBorder mixin is not
used anywhere and could be removed.
 2015-09-22 10:57:30 -07:00
Charles Hacskaylo
54334a8906 [Frontend] Setting default theme for open back to espresso 
open #95b
Also removed unused COMPILE.scss file;
 2015-09-21 14:26:50 -07:00
Charles Hacskaylo
c9b2f5804d [Frontend] Minor tweaks to sizing of controls 
open #95b
View switcher and plot control buttons now made small
when object is in a frame context in a Layout;
 2015-09-21 14:24:19 -07:00
Victor Woeltjen
0c1f77cfab [Mobile] Collapse tree on click 
Collapse tree any time a user does an action in the
tree that would select an object; don't only do this
on navigation changes, because this fails to detect
occasions where user clicks the already-navigated-to
object.
 2015-09-21 10:53:45 -07:00
Victor Woeltjen
ae4313253c [Mobile] Test mct-device 2015-09-18 16:47:50 -07:00
Victor Woeltjen
1e6c4732f1 [Mobile] Consolidate BrowseTreeController 
Make mobile variant of BrowseTreeController the regular version
of that controller; Browse mode has a dependency on mobile by
way of the mct-device directive anyway.
 2015-09-18 15:55:58 -07:00
Victor Woeltjen
884d36ad6d [Mobile] Test BrowseTreeController variants 2015-09-18 15:49:55 -07:00
Victor Woeltjen
24586ae378 [Mobile] Remove BackArrowController 
Remove BackArrowController; behavior can be implemented
in template.
 2015-09-18 15:29:55 -07:00
Victor Woeltjen
cf97b30084 [Mobile] Add empty specs 2015-09-18 15:21:23 -07:00
Victor Woeltjen
e86e61c2ac [Mobile] Fix test setup error 
Use correct user agent strings for iPhone/iPad
(these had been reversed in the spec.)
 2015-09-18 15:12:48 -07:00
Victor Woeltjen
befa66a9e2 [Mobile] Remove obsolete test cases 
...for functionality that has been moved out of TreeNodeController.
 2015-09-18 14:54:37 -07:00
Victor Woeltjen
5a1c83fca8 [Mobile] Update spec for AgentService 2015-09-18 14:53:14 -07:00
Victor Woeltjen
88bb213162 [Mobile] Move spec for AgentService 2015-09-18 14:34:14 -07:00
Victor Woeltjen
bf05e55d02 [Mobile] Use mct-device in tree nodes 2015-09-18 12:25:51 -07:00
Victor Woeltjen
c057ba38a5 [Mobile] Add mct-device directive 
Add directive which can be used to include certain elements
only on specific devices.
 2015-09-18 12:13:37 -07:00
Victor Woeltjen
70bcb723ef [Mobile] Small tweaks/bug fixes 
Small tweaks/fixes (use appropriate variable names etc) for
refactoring mobile support classes.
 2015-09-18 12:13:05 -07:00
Victor Woeltjen
4c5808c8c9 [Mobile] Move mobile-specific behavior to template 2015-09-18 11:01:54 -07:00
Victor Woeltjen
fa186a1556 [Mobile] Update agentService usages 2015-09-18 10:07:27 -07:00
Victor Woeltjen
0b4f44f00d [Mobile] Remove leading slash, redundant declaration 2015-09-18 09:18:19 -07:00
Victor Woeltjen
dce7253b27 [Mobile] Move mobile bundle 2015-09-18 09:17:01 -07:00
Victor Woeltjen
1d1589da68 [Mobile] Move agentService to mobile bundle 
...and make API tweaks.
 2015-09-17 18:05:48 -07:00
Victor Woeltjen
6aba34dd5a [Mobile] Override browse behavior 
Override browse tree behavior such that tree collapses upon
navigation change in mobile.
 2015-09-17 17:54:01 -07:00
Victor Woeltjen
19500c2704 [Mobile] Restore browse controller from master 2015-09-17 17:42:38 -07:00
Victor Woeltjen
2090b1a958 [Browse] Separate tree expand/collapser 2015-09-17 17:03:35 -07:00
Victor Woeltjen
cc3b0ecfca Merge branch 'open-master' into mobile 
Merge in latest from master branch into mobile branch
 2015-09-17 16:40:48 -07:00
Charles Hacskaylo
9a7f435b61 [Frontend] Minor color tweaks in Snow theme 
open #95
vista #65
(cherry picked from commit 98c5334)
 2015-09-17 09:58:13 -07:00
Charles Hacskaylo
9fdb9f0170 [Frontend/PLATFORM] Cherry picking from platform changes in vista65 
open #95
vista #65
Style mods for selects;
(cherry picked from commit 8b2c4c6)
 2015-09-16 17:18:58 -07:00
Charles Hacskaylo
f28d2f19d0 [Frontend/PLATFORM] Cherry picking from platform changes in vista65 
open #95
vista #65
scss and html mods for VISTA-related elements;
(cherry picked from commit 6ef3987)
 2015-09-16 17:17:54 -07:00
Charles Hacskaylo
4f5a1115d2 [Frontend] Themes final on open prior to VISTA integration 
open #95
Branch open95b now replaces open95;
Fix to status indicator to only
display when title length > 0;
 2015-09-16 10:45:22 -07:00
Victor Woeltjen
d981e7bb1d [Browse] Separate out back-arrow behavior 
Supports integration of changes for mobile, nasa/openmct#95
 2015-09-15 12:18:57 -07:00
Victor Woeltjen
a3a6706869 [Browse] Separate out back-arrow behavior 
Supports integration of changes for mobile, nasa/openmct#95
 2015-09-15 12:13:11 -07:00
Victor Woeltjen
72c122e0ee Merge remote-tracking branch 'github/master' into open95b 
Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
 2015-09-15 11:35:25 -07:00
Charles Hacskaylo
3e5d46a62b [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Limits, plots, etc.;
Misc sanding and shimming;
Updated  symbols font to replace missing
Info symbol;
 2015-09-11 16:25:19 -07:00
Victor Woeltjen
47bfe40294 [Common UI] Remove unused variable 
...from mct-splitter directive.
 2015-09-11 13:40:25 -07:00
Victor Woeltjen
3a3829682c [Common UI] Only trigger digest on change 
...from mct-split-pane.
 2015-09-11 13:33:17 -07:00
Victor Woeltjen
861ea8bab7 [Common UI] Poll split pane position 
Poll to position the splitter in an mct-split-pane, in
order to detect later style changes. #53.
 2015-09-11 13:12:24 -07:00
Charles Hacskaylo
a840b59044 [Frontend] IN-PROGRESS Theming continues, sanding 
open #95
Fixed grid icon hover color;
Various color normalization;
 2015-09-10 15:58:00 -07:00
Charles Hacskaylo
d14c4e08b8 [Frontend] IN-PROGRESS Theming continues 
open #95
Shadow and color normalization: fixed-position, tabular;
Updated paint bucket and icon-box in symbols font;
Custom checkboxes now use inset shdw;
 2015-09-10 15:01:51 -07:00
Victor Woeltjen
de6dfe1fdc Merge remote-tracking branch 'github/master' into mobile 
Merge in latest from master into mobile branch
to reconcile conflicts

Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
 2015-09-10 15:01:38 -07:00
Charles Hacskaylo
3b2454c6a9 [Frontend] IN-PROGRESS Theming continues 
open #95
Search, plots;
Minor tweaks to add shdw to items and buttons;
 2015-09-10 11:43:39 -07:00
Victor Woeltjen
426ab44d93 [Angular] Update Locator specs 
Update locator specs to provide expected functionality
of .
 2015-09-09 18:17:07 -07:00
Charles Hacskaylo
3792dab0f9 [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Menus sanded and normalized;
 2015-09-09 17:25:10 -07:00
Victor Woeltjen
c6df7cebe5 [Angular] Check for context capability 
Check for existence of context capability from Remove action
during navigation check. This avoids an exception that
appears to have been swallowed in earlier versions of
Angular.
 2015-09-09 17:25:02 -07:00
Victor Woeltjen
52df7fe1e2 [Angular] Avoid infinite digest 
Avoid infinite digest loop from LocatorController associated
with upgrade to Angular 1.4.4
 2015-09-09 17:15:35 -07:00
Charles Hacskaylo
32b895ba62 [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Refactored btnSubtle and containerSubtle mixins
to simplify;
 2015-09-09 16:49:59 -07:00
Charles Hacskaylo
4db48afab0 [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Mostly about the overlay and forms;
Buttons, menus, selects tweaks continued;
Initial check and tweaks in mobile;
 2015-09-09 15:55:12 -07:00