13b66cd215
[Mobile] IN PROGRESS: Only display custom scrollbars in desktop mode
...
open #74
2015-08-24 17:04:38 -07:00
aca06c6007
[Action] Remove Action Merged
...
Remove Action merged to allow removal of
parent or current selected object, then
navigation to lowest existing parent if
currently located in deleted object.
2015-08-24 16:46:48 -07:00
5184e08a5b
[Mobile] IN PROGRESS: Tweak to TypeImpl to return glyph for unknown types
...
open #74
Thanks Victor!;
2015-08-24 16:45:55 -07:00
69c6d4bd26
[Mobile] IN PROGRESS: Tweaks to labels;
...
open #74
Cleaned up layout of bottom-bar;
Fixed class selector for ue-bottom-bar;
2015-08-24 16:31:38 -07:00
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
76c4b96683
[Mobile] IN PROGRESS: Menu hide/show fixes; font-size tweaking
...
open #74
Changed .right-repr to use translateX in phone portrait mode;
font-size tweaking;
Refactored css organization in mobile/_layout.scss;
2015-08-24 15:24:35 -07:00
c81e2dbb4a
Merge branch 'master' of https://github.com/nasa/openmctweb into search
...
Conflicts:
platform/commonUI/general/src/controllers/TreeNodeController.js
platform/persistence/elastic/src/ElasticSearchProvider.js
2015-08-24 13:14:43 -07:00
44ed4e0e0d
[Mobile] IN PROGRESS: Minor tweak for line-height in top-bar
...
open #74
2015-08-24 12:39:50 -07:00
b860db302c
[Framework] Bump angular to 1.4.4
...
Upgrade angular to latest version, also update angular-route.
2015-08-24 12:39:48 -07:00
e96d3e3738
[Mobile] IN PROGRESS: Significant redo of object-header
...
open #74
Added .bar .l-flex using display: flex in object header;
2015-08-24 12:22:08 -07:00
f1ca9ff15e
Merge remote-tracking branch 'origin/open1334' into open1416
2015-08-24 11:55:27 -07:00
9eb23a62bc
Merge branch 'open75' into open-master
2015-08-24 10:42:19 -07:00
9b6a839c06
Merge branch 'open-jpl48' into open-master
2015-08-24 10:39:17 -07:00
6aaa887e65
[Imagery] Start off with empty timestamp
...
Show nothing in the timestamp area when there is no
data yet available for image telemetry, WTD-1170.
2015-08-24 09:39:42 -07:00
1e332da11b
[Docs] ElasticSearch is not Couch
2015-08-24 09:04:03 -07:00
3a050cc5b8
[Style] space after operator
2015-08-24 09:03:31 -07:00
039d692e4c
Forgot to add new .scss file
...
open #74
2015-08-21 15:10:19 -07:00
ee608cc4a4
[Mobile] IN PROGRESS: General fixes, spurred by mobile, for object-header
...
open #74
Attempting to layout using flex - not working;
See http://jsfiddle.net/charlesh88/cpf9zjts/9/ for working example;
New _flex.scss added;
This commit is changed elements that are mostly solid;
2015-08-21 15:09:23 -07:00
d0183d44c9
[Actions] Remove Action
...
When an ascendant or parent or currently
selected object is removed the user is navigated
to the parent of the object being removed. Added variables
to RemoveAction test to test removing currently selected
domainObject.
2015-08-21 13:04:47 -07:00
a7cc06a28b
Merge remote-tracking branch 'upstream/master'
2015-08-21 09:08:00 -07:00
da8eb334e3
[Mobile] Sanding of mobile styles continues, in progress
...
open #74
CSS and markup changes for split pane holders;
drop shadow added to tree area;
Tree item cleanups;
This or earlier commit broke treeview nav action;
TO-DO: fix treeview nav action to hide menu;
2015-08-20 18:36:44 -07:00
67592def90
[Mobile] Sanding of mobile styles, in progress
...
open #74
CSS and markup changes for mobile,
particularly on grid-item;
Mod to behavior in tree for mobile nav:
leaf node grid-item click now navs to item;
Fixed info-button to work properly with mod to
infoButtonGesture.js;
2015-08-20 16:11:45 -07:00
3484b315cf
[Mobile] Sanding of mobile styles, cherry-pick to master
...
open #74
CSS and markup changes for mobile
that are good for master now;
2015-08-20 16:09:35 -07:00
b1e1e85bbd
Merging in latest openmctweb master
...
open74
Had to resolve conflicts
2015-08-20 10:36:41 -07:00
1e79c507c8
[Build] Ignore Intellij *.iml configuration files
2015-08-20 09:25:27 +02:00
249a9b2eb2
[Frontend] Better sorting indicators added to styles
...
JPL #48
Simplified styles to indicate sort by asc and desc in table th elements;
(cherry picked from commit 15a2416)
2015-08-19 18:17:15 -07:00
02abbdf4fe
Resolving conflict in platform/.../theme-espresso.css
...
#75
Merged in master branch;
Re-rendered platform/.../theme-espresso.css;
2015-08-19 16:22:21 -07:00
08d68f99a5
[Frontend] Fix word wrapping issues in hover bubble
...
#75
CSS modified to utilize word-break property;
2015-08-19 16:09:55 -07:00
f27e4d6e06
Merge branch 'open-master' into open1482c
...
Merge in latest in preparation to merge; WTD-1482
Conflicts:
platform/commonUI/browse/src/creation/CreationService.js
platform/core/src/models/RootModelProvider.js
platform/entanglement/src/services/LinkService.js
platform/entanglement/src/services/MoveService.js
2015-08-19 15:00:52 -07:00
9c578c53db
Merge pull request #64 from nasa/open-965
...
[Location] track location of objects and distinguish links from originals
WTD-965
2015-08-19 14:28:00 -07:00
a4a9acd2ea
Merge branch 'open-master' into open-965
...
Merge in latest into topic branch for WTD-965 to
resolve conflicts.
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
2015-08-19 14:16:56 -07:00
c118234bbf
[Style] Brace after if criteria
2015-08-19 13:55:02 -07:00
a94763041e
[Move] correct logic and specification
2015-08-19 13:16:36 -07:00
26892e7104
[Location] isLink/isOriginal are antonyms
...
Simplify implementation of isLink/isOriginal for better maintainability.
2015-08-19 11:49:45 -07:00
5c74365f4b
[Root] Root model provider sets location
...
Root model provider sets the location of roods so that the location
capability does not need special handling for this.
2015-08-19 11:49:03 -07:00
94854e5965
[Location] can retrieve contextual location
...
Clarify naming of method for retrieving contextual location of a domain
object.
Default behavior for objects that do not have a context is to return
undefined. Note that default behavior is not specified and could change
if needed.
2015-08-19 11:33:45 -07:00
9cf30f4213
[Location] setPrimaryLocation takes location.
...
Rename "persistLocation" to be more clearly named, and make it take an
argument to allow for greater control outside the capability.
2015-08-19 11:25:41 -07:00
eb776e69c0
[JSDoc] Document LocationCapability constructor
2015-08-19 11:13:24 -07:00
c4dd4f5c45
[Mobile] Merge
...
Merged with master.
2015-08-19 11:01:58 -07:00
33a63947e5
Merge branch 'open70' into search
2015-08-19 10:06:32 -07:00
432ec519b6
Merge branch 'search' into open70
...
Conflicts:
platform/commonUI/browse/res/templates/browse.html
2015-08-19 10:05:38 -07:00
7f65ba236c
[Frontend] Tweaks to Load More results button
...
#70
2015-08-19 09:44:23 -07:00
3a86f5e746
[Frontend] Tweak to Load More button label
...
#70
2015-08-18 19:54:50 -07:00
4e3e3653a3
[Frontend] Styling for search elements
...
#70
Significant .scss and markup changes across search;
New symbols font (v2.2) char for clear icon;
To-do: style "load more" element;
2015-08-18 19:51:47 -07:00
d3ea67fbd9
[Search] Templates vs representations
...
Made the search and search-menu templates into
representations, to be more consistent.
2015-08-18 16:54:36 -07:00
9ebc04ef14
[Search] Cleanup and documentation
2015-08-18 16:08:16 -07:00
e426e0e5ec
Merging in latest from master
...
#70
2015-08-18 15:23:42 -07:00
3d1e1659c2
[Search] Update tests
...
for 100% coverage.
2015-08-18 12:37:47 -07:00
17f2bb966b
[Search] Update tests and remove redundancy
...
Updated the generic provider test. Removed index
checking from the generic search worker, because
that checking is already done (more efficiently)
in the generic search provider.
2015-08-18 12:27:04 -07:00
158f549df2
[Search] Change back bundles.json
2015-08-18 11:48:07 -07:00
