2134 Commits

Author SHA1 Message Date
Shivam Dave
c85cec0445 Merge remote-tracking branch 'upstream/master' into mobile_ins 2015-09-01 14:51:05 -07:00
Shivam Dave
199be71f8f Merge pull request #96 from nasa/open92
[Identity] Add identity service

1. Changes appear to address issue? Y
2. Appropriate unit tests included? Y
3. Code style and in-line documentation are appropriate? Y
4. Commit messages meet standards? Y
2015-09-01 14:49:04 -07:00
Victor Woeltjen
ac2144d5c5 [Identity] Satisfy JSLint 2015-09-01 12:04:36 -07:00
Victor Woeltjen
01f2fab70f [Create] Filter out control-less properties
When properties have no control defined, don't show them
in the create dialog (but do show them in metadata, e.g.
info bubble.) For nasa/openmctweb#92
2015-09-01 11:48:15 -07:00
Victor Woeltjen
7562c82369 [Identity] Add default identity provider
nasa/openmctweb#92
2015-09-01 11:43:07 -07:00
Victor Woeltjen
c3efb29dfc [Metadata] Fix whitespace 2015-09-01 11:31:42 -07:00
Victor Woeltjen
bb738f9a93 [Identity] Decorate domain objects with creator
nasa/openmctweb#92
2015-09-01 11:19:53 -07:00
Victor Woeltjen
97071fc72c [Identity] Remove unnecessary escapement
JSLint does not like unnecessary use of unicode escapement.
2015-09-01 11:01:08 -07:00
Victor Woeltjen
b39753d0a6 [Entanglement] Separate out location
Separate out location property from the CreationService,
instead handle in the entanglement bundle; this is
consistent with changes for identity management (attaching
a creator to newly-created domain object models).
for nasa/openmctweb#92
2015-09-01 10:57:56 -07:00
Victor Woeltjen
e3eda5112c [Identity] Expose creation service as provider
Expose creation service as a provider of a composite service;
this allows it to be decorated by the identity bundle to
attach a creator, for nasa/openmct#92
2015-09-01 10:41:27 -07:00
Shivam Dave
e193223a37 [Mobile] Browse Cleaned
Cleaned up the browse.html
file to remove the excess inspector comments
and helper comments regarding individual
objects.
2015-08-31 14:14:05 -07:00
Shivam Dave
cb5429979a [Mobile] layout adjustment
Currently mobile css transition does
not work on phone portrait. Added
some not reached css classes used in old
slide menu.
2015-08-31 14:13:14 -07:00
Shivam Dave
46deabafee Merge branch 'mobile' into mobile_ins 2015-08-31 13:43:45 -07:00
Shivam Dave
021d105fd0 Merge remote-tracking branch 'upstream/open95' into mobile 2015-08-31 13:37:43 -07:00
Shivam Dave
7ffbc9ad2f [Remove Action] Check
Added check for traverseObject
context because prior to this,
was not checked.
2015-08-31 13:37:22 -07:00
Charles Hacskaylo
90f62b92a5 [Frontend] Super-minor cleanups in .scss files
open #93
2015-08-31 12:54:52 -07:00
Charles Hacskaylo
5a991076ea [Frontend] CSS and markup tweaks to enable flex layout
open #93
Layout frame and imagery markup modified;
2015-08-31 12:34:34 -07:00
Victor Woeltjen
eb4ea8f2d4 [Identity] Clean up JSDoc
nasa/openmctweb#92
2015-08-28 16:41:41 -07:00
Victor Woeltjen
9692596859 [Identity] Change type name
Change type name for identity metadata to make it easier
to correlate back to the identity service. nasa/openmctweb#92
2015-08-28 16:38:36 -07:00
Victor Woeltjen
ce152881cc [Identity] Add example identity service
nasa/openmctweb#92
2015-08-28 16:36:57 -07:00
Victor Woeltjen
f40e7d7105 [Identity] Add identity indicator
nasa/openmctweb#92
2015-08-28 16:36:41 -07:00
Victor Woeltjen
a8fc5ee8ed [Identity] Add license headers 2015-08-28 15:49:30 -07:00
Victor Woeltjen
5400f51204 [Identity] Include identity bundle
...in list of active bundle, nasa/openmctweb#92
2015-08-28 15:47:30 -07:00
Victor Woeltjen
29c9b2a08f [Identity] Add identity aggregator
Add an aggregator to handle exposing the user's identity,
nasa/openmctweb#92
2015-08-28 15:46:15 -07:00
Victor Woeltjen
e4d136d345 [Persistence] Update spec
Update spec for persistence capability to reflect changes for
nasa/openmctweb#92
2015-08-28 15:46:06 -07:00
Victor Woeltjen
620c0415cf [Persistence] Use create from persistence capability
...when an object hasn't been previously persisted. This allows
for compatibility with persistence services which disallow
updates for nonexistent objects (which is not abnomal behavior.)
nasa/openmctweb#92
2015-08-28 15:45:48 -07:00
Shivam Dave
78e8c15281 [Mobile] Tests
Removed treeSlide from the
browse controller test.
2015-08-28 14:18:49 -07:00
Shivam Dave
1f9728d29c [Mobile] Tests
BrowseObjectControllerSpec adjusted
to have a mockAgenstService. Test
completed.
2015-08-28 14:07:46 -07:00
Shivam Dave
08794346c8 [Mobile] Browse Object
Added comments and removed unnecessary
commented out code.
2015-08-28 13:56:48 -07:00
Shivam Dave
00f71d3882 [Mobile] Browse Object
By default, on opening the page in a
mobile device will have the tree menu closed.
Also simplified the if statement to a ternary
operation.
2015-08-28 13:55:09 -07:00
Shivam Dave
4cb01eb917 [Mobile] Browse Object
Added agentService to BrowseObjectController.
2015-08-28 13:53:53 -07:00
Shivam Dave
8e6505c80f [Mobile] Phone Portrait Close
Used merged function to close the
left tree on selection of an object
on phone portrait.
2015-08-28 13:38:29 -07:00
Shivam Dave
0521b09bec [Mobile] Merge
Added comments to _layout.scss
2015-08-28 13:17:17 -07:00
Shivam Dave
2b7a4d40eb [Mobile] Merge
Moved some of css 'sanding' over
to merged in slide menu. Also adjusted with
to be same as old show/hide tree dimensions.
2015-08-28 12:48:41 -07:00
Shivam Dave
43523046da [Mobile] Merge3
Set the placement of hamburger button as before
however moved it into browse.html and tied to
slide pane model.
2015-08-28 11:46:21 -07:00
Shivam Dave
d8e9b0e8e8 [Mobile] Merge2
Hamburger button used to perform slide
temporarily, also it has a different location
on mobile/desktop & different widths. Splitter is
working as intended on desktop.
2015-08-28 11:10:02 -07:00
Shivam Dave
2a288cd740 [Mobile] Merge 1
Part 1 of merge, sliding menu not
working, however right representation
works and the left tree is expanded.
2015-08-28 10:38:45 -07:00
Charles Hacskaylo
54bf39344a [Mobile] Multiple mobile Safari fixes
open #74
New mixins to prefix '-webkit-' to props and vals;
'flex' classes use new webkit mixins;
Fixed flex layout of .object-browse-bar and
.context-available element;
Migrated CSS to remove small .scss include files;
2015-08-27 17:05:50 -07:00
Charles Hacskaylo
683b3f7511 Merge remote-tracking branch 'github/mobile' into open74-m-master 2015-08-27 12:56:47 -07:00
Shivam Dave
510e7d1261 [Mobile] Merge
Merged with master, getting the
RemoveAction changes.
2015-08-27 12:15:48 -07:00
Shivam Dave
63b41d796a [Mobile] Clean Up
Cleaned up context menu gesture
comments with spacing.
2015-08-27 12:06:25 -07:00
Charles Hacskaylo
80a91970f6 Merge remote-tracking branch 'github/mobile' into open74-m-mobile 2015-08-27 11:34:14 -07:00
Shivam Dave
f0c64b6b92 [Browse] Back Arrow
Refactored Back Arrow to work same as prior
commit, however with less if else statements.
Returns if not at root, otherwise root is set to
true.
2015-08-27 10:45:48 -07:00
Shivam Dave
48136c2265 [Context] Back Arrow
Checks the Back Arrow in both checkRoot and
navigateToParent, also checks grandparent in both.
This allows the back arrow to hide in search when
context is unavailable.
2015-08-27 10:42:11 -07:00
Charles Hacskaylo
1961adf8d6 [Mobile] Fixed font-size and line-height problem in tree
open #74
2015-08-27 10:33:32 -07:00
Victor Woeltjen
5230bdfc6b Merge pull request #86 from nasa/open51
Addresses nasa/openmct#51
2015-08-27 10:02:24 -07:00
Victor Woeltjen
97acf2012a Merge pull request #87 from nasa/open84
[Search] Hide link icons in search results
2015-08-27 10:00:34 -07:00
Shivam Dave
687d86790e [Action] RemoveAction
Added comments regarding change in
checking of traversed objects.
2015-08-27 09:49:26 -07:00
Shivam Dave
3ec4cc099b [Action] RemoveAction
Adjusted unit tests for checking if
traverseObject is undefined. Also removed
unnecessary ROOT_ID variable.
2015-08-27 09:41:00 -07:00
Shivam Dave
dadbf3f6dc [Action] RemoveAction
Checks if the object exists, instead of
checking if the ROOT is specifically reached,
when traversing up to ancestors.
2015-08-27 09:17:11 -07:00