ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 14:32:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,706 Commits 989 Branches 212 Tags 191 MiB
e49b55024f
Commit Graph

78 Commits

Author SHA1 Message Date
Victor Woeltjen
f7839b758d Merge remote-tracking branch 'github/master' into open233b 
Resolve conflicts on nasa/openmctweb#233

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json
	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
	platform/commonUI/general/res/sass/_main.scss
	platform/commonUI/general/res/sass/user-environ/_layout.scss
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/espresso/res/sass/_constants.scss
	platform/commonUI/themes/snow/res/css/theme-snow.css
 2015-11-04 09:28:19 -08:00
Pete Richards
9523c918fb Merge remote-tracking branch 'github-open/open182' into open-master 2015-11-03 15:52:14 -08:00
Charles Hacskaylo
1e6731e6f2 Merge open155 > github/master 
open155
open186
Trying a third time to resolve conflicts between open155 and master;
 2015-10-30 16:20:57 -07:00
Victor Woeltjen
7f571415dc [Time Conductor] Change format handling 
Use default format when no format is specified, and throw an
error when a specified format is unrecognized, from both
date-time field controller and time range controller.
 2015-10-30 13:28:01 -07:00
Victor Woeltjen
18cdaf1b53 [Time Conductor] Fix extension definition 
For date time field controller; refer to correct implementation.
 2015-10-27 13:03:04 -07:00
Victor Woeltjen
6784c6567b [Time Conductor] Add date-time field 
Add mct-control which includes both the date-time picker and
its corresponding text entry area, per code review feedback
from nasa/openmctweb#204.
 2015-10-27 13:00:42 -07:00
Victor Woeltjen
aa23d358cc [Time Conductor] Use formatService instead of timeService 2015-10-26 10:03:49 -07:00
Charles Hacskaylo
2452b25fd4 [Frontend] Manual integration of Inspector 
open #90
open #73
In-progress manual integrated Sarah Hale's work on ObjectInspector;
 2015-10-23 11:37:02 -07:00
Victor Woeltjen
111b3bac09 [Time Conductor] Remove dateService 
Replaced by timeService
 2015-10-22 16:27:21 -07:00
Victor Woeltjen
16e4c32709 [Time Conductor] Remove now dependency, fix domain switch 
Remove dependency on now (current time can be retrieved via
timeService); fix domain-switching behavior such that changes
to time systems are reflected in changes to default bounds.
 2015-10-22 16:05:09 -07:00
Victor Woeltjen
a154c9c870 [Time Conductor] Use timeService from control 2015-10-22 15:51:12 -07:00
Victor Woeltjen
117470068a [Time Conductor] Use dateService from TimeRangeController 2015-10-22 12:17:08 -07:00
Victor Woeltjen
0d47b7c47d [Time Conductor] Expose dateService in bundle definition 2015-10-22 12:10:12 -07:00
Victor Woeltjen
1ad0bf337c [Common UI] Use popupService from mct-popup 2015-10-02 10:48:45 -07:00
Victor Woeltjen
6cbd3e5fae [Time Conductor] Use popupService from infoService 2015-10-01 16:25:33 -07:00
Victor Woeltjen
3050b265fb [Time Conductor] Expose popupService 2015-10-01 15:27:36 -07:00
Victor Woeltjen
6bd8e7a47c Merge remote-tracking branch 'github/master' into open1515 2015-09-24 11:17:13 -07:00
Victor Woeltjen
dbe1875e70 [Themes] Resolve conflicts 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
 2015-09-22 16:12:44 -07:00
Victor Woeltjen
4c5808c8c9 [Mobile] Move mobile-specific behavior to template 2015-09-18 11:01:54 -07:00
Victor Woeltjen
0b4f44f00d [Mobile] Remove leading slash, redundant declaration 2015-09-18 09:18:19 -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
Victor Woeltjen
9a78b63065 [Time Conductor] Try to rewrite datetime picker as control 2015-09-15 18:37:36 -07:00
Victor Woeltjen
6c497f3c36 [Time Conductor] Start adding datetime picker 
WTD-1515
 2015-09-15 18:09:46 -07:00
Victor Woeltjen
d951b794e3 [Time Conductor] Support date choice 
...from date-time picker. WTD-1515
 2015-09-15 15:55:13 -07:00
Victor Woeltjen
797046aca4 [Time Conductor] Populate datetime picker 
WTD-1515
 2015-09-15 15:24:54 -07:00
Victor Woeltjen
6f28ab0145 [Time Conductor] Begin adding custom date picker 
WTD-1515
 2015-09-15 13:08:05 -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
Victor Woeltjen
4549828cae Merge remote-tracking branch 'github/master' into open1515 2015-09-15 08:57:49 -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
Victor Woeltjen
78fae345da [Time Conductor] Rename TimeConductorController 
Rename TimeConductorController to TimeRangeController, to
reflect that this is intended to serve as a more general
control. Additionally, stop using arrays for inner and
outer bounds and instead use explicit start/end properties,
for clarity. WTD-1515
 2015-09-10 10:58:47 -07:00
Charles Hacskaylo
37c34c668c [Frontend] IN-PROGRESS Major restructuring of /platform/commonUI/ to add themes structure 
open #95
New themes bundle files, .scss and directories;
Moved constants definitions (mainly colors) from commonUI/.../_constants
to individual themes _constants files;
tweaks to mixins files;
changed pathways to font and images in commonUI/.../_constants;
 2015-09-03 15:34:39 -07:00
Victor Woeltjen
a18cc50a43 [Time Conductor] Begin binding control to data 2015-09-02 16:53:10 -07:00
Victor Woeltjen
91fe3d798f [Time Conductor] Begin adding controller 
WTD-1515
 2015-09-02 16:31:58 -07:00
Charles Hacskaylo
2cbe686732 [Frontend] IN-PROGRESS Refactoring to cleanup SASS file structure 
open #95
Moved styles from initialization.scss to user-environ/_layout;
forms.scss, items.scss, tree.scss includes moved into main.scss;

Removed forms.css, items.css, tree.css,
Removed initialization.scss, tree.scss
 2015-08-31 14:11:42 -07:00
Shivam Dave
cd46dab5c1 [Mobile] Merge 
Merged with master and resolved conflicts.
 2015-08-25 12:36:50 -07:00
Shivam Dave
6a2bdd103b [Mobile] Hide Tree 
On selecting a node in the tree, if the
user is on phone and in portrait, than
emit up to the browse controller to call
treeSlide(), which will hide the tree menu.
Also adjusted the agent service to properly
check for orientation using window.innerHeight/
Width. Also created function for the selection
of an object in BrowseController.
 2015-08-24 16:17:58 -07:00
Pete Richards
449db4f3a9 [Templates] Add stubs for link indicator 
Update templates to use the location capability to show an indicator.
 2015-08-06 14:52:42 -07:00
Shivam Dave
3d524d7572 [Mobile] AgentService 
Replaced name queryService with agentService.
 2015-08-04 10:11:25 -07:00
Shivam Dave
e32403a75f [Mobile] Clean-Up 
Cleaned the unused code for the
backArrow and long touch gestures.
Commented out functions for later use
Currently shows the back arrow, however,
only will print to console on press.
Edited tests where mobile checks were breaking
and fixed.
 2015-07-28 10:56:29 -07:00
Shivam Dave
6e43a92191 [Mobile] Merge 
Fix Conflicts.
 2015-07-27 15:21:59 -07:00
Shivam Dave
56e51ea32a [Mobile] Reformat of menu 
Reformats menu to move the
arrow to the right and now
that is what selects an object.
Pressing the actual menu item will
enact the dropdown menu. This
only happens on mobile platforms.
 2015-07-21 13:29:45 -07:00
Dave
635e1eda69 [Mobile] Clean-Up 
Removed unused menu button and
cleaned up treeCl to be treeClass.
 2015-07-09 15:14:36 -07:00
Dave
40d53f941f [Mobile] TreeMenuController 
Removed the TreeMenuController.js file
and from the bundle. What this achieves
is already done in BrowseController.js
 2015-07-09 14:46:36 -07:00
Dave
07ef4dfe8a [Mobile] Menu Slide 
Menu slides, but not transition
css slides out on click. Currently
uses document, which needs to be
replaced with angular version using
 and/or  and/or
ng-class and/or ng-click.
 2015-07-08 14:27:59 -07:00
Dave
79fb6eabd9 [Mobile] Menu Button 
Menu button added to the
bundle and as a file modelled
after the action button.
 2015-07-07 16:28:34 -07:00
Sarah Hale
9e6d84a1d5 [Edit] No more tooltips 
Changed the attribute of 'title' on mct-container
to 'label'. This made the tooltips in Edit mode
dissapear. #46.
 2015-07-07 11:14:45 -07:00
Victor Woeltjen
0ee76421e0 [Common UI] Add mct-splitter 
WTD-1363.
 2015-06-26 15:59:16 -07:00
Shivam Dave
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
Charles Hacskaylo
d7e43026cd [Merge] Merge in open-master, resolve conflicts in _constants.scss 2015-06-10 14:04:48 -07:00
Victor Woeltjen
588c35de4e Merge branch 'open-master' into open884 
Merge latest from master branch into topic branch for WTD-884
 2015-06-04 10:39:25 -07:00