ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-29 09:28:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,106 Commits 988 Branches 212 Tags 191 MiB
411a4ebfbf
Commit Graph

2106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Woeltjen
411a4ebfbf Merge remote-tracking branch 'github/master' into mobile 2015-09-17 16:41:13 -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
ac48039b90 [Mobile] Create empty bundle for mobile 2015-09-17 16:40:18 -07:00
Victor Woeltjen
411f0d904d [Entanglement] Test LocatingObjectDecorator 2015-09-17 14:45:05 -07:00
Victor Woeltjen
d92ae4d508 [Core] Add tests for 'contextualize' 2015-09-17 14:06:22 -07:00
Victor Woeltjen
bc4c7feb6c [Core] Update spec for CompositionCapability 
...to reflect changes to separate out contextualization
of domain objects
 2015-09-17 13:57:20 -07:00
Victor Woeltjen
c4aed57165 [Entanglement] Refactor LocatingObjectDecorator 
Rearrange code in LocatingObjectDecorator to make it easier to
follow; add comments.
 2015-09-17 13:51:50 -07:00
Victor Woeltjen
88b8528aaf [Entanglement] Log a warning on cycle detection 
nasa/openmctweb#84
 2015-09-17 13:42:08 -07:00
Victor Woeltjen
d1c0d81120 [Entanglement] Contextualize objects by location 
Add a context capability to domain objects based
on their location at the time they are loaded.
nasa/openmctweb#84
 2015-09-17 13:37:57 -07:00
Victor Woeltjen
a233856bac [Core] Separate out contextualize 
Separate out contextualize function to facilitate
reuse from entanglement bundle. nasa/openmctweb#84
 2015-09-17 13:15:42 -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
Pete Richards
8c1b70f085 Merge remote-tracking branch 'github-open/open53' into open-master 2015-09-14 11:00:56 -07:00
Pete Richards
c010011798 Merge remote-tracking branch 'github-open/open1252' into open-master 2015-09-14 10:51:30 -07:00
Victor Woeltjen
ecf7f4b235 [Info Bubble] Remove ID 
Don't show domain object id in info bubble; this is not
useful information to non-developers. (For developers,
this information can be retrieved from the URL by
navigating to a domain object.) WTD-1252
 2015-09-11 16:29:20 -07:00
Victor Woeltjen
01045e6ee1 [Persistence] Add local storage indicator 2015-09-11 14:48:17 -07:00
Victor Woeltjen
febb0edede [Persistence] Add spec for local storage persistence 2015-09-11 14:31:57 -07:00
Victor Woeltjen
048eb20450 [Persistence] Update code style 
Update code style for local storage based persistence.
 2015-09-11 14:05:01 -07:00
Victor Woeltjen
36e38b9454 [Persistence] Add local storage to active bundles 2015-09-11 13:54:33 -07:00
Victor Woeltjen
215b4a154b [Persistence] Move local storage to platform 
#79
 2015-09-11 13:53:47 -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
Victor Woeltjen
f17410a85b [Capabilities] Avoid erroneous logging 
Fix logic error which caused an inaccurate warning to
be logged when capabilities are overridden by priority.
Addresses #49.
 2015-09-11 11:38:22 -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
Victor Woeltjen
426ab44d93 [Angular] Update Locator specs 
Update locator specs to provide expected functionality
of .
 2015-09-09 18:17:07 -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
Victor Woeltjen
52c471bd3a [Angular] Clean up InfoGesture workaround 
...and add comment pointing back to the Angular issue
which motivates the workaround.
 2015-09-08 21:14:46 -07:00
Victor Woeltjen
560c8612bd [Angular] Amend InfoGesture for compatibility 
Update the info gesture so that it does not schedule
multiple bubbles to be shown when multiple events fire,
for AngularJS 1.4.4 compatibility.
 2015-09-08 19:53:38 -07:00
Victor Woeltjen
6a917f5393 Merge branch 'open-master' into angular-1.4.4 2015-09-08 19:26:46 -07:00
Shivam Dave
dafcda281a Merge pull request #100 from nasa/open99 
[Identity] Provide an undefined identity
 2015-09-04 16:05:00 -07:00
Victor Woeltjen
cc5908d26f [Identity] Provide an undefined identity 
Provide an undefined identity by default, instead of
an Unknown User. This suppresses display of identity-related
features (such as the identity indicator) while still
providing a default implementation of the identityService
for platform components to utilize. nasa/openmctweb#99
 2015-09-04 12:17:02 -07:00
Shivam Dave
678d11832c Merge remote-tracking branch 'upstream/master' into mobile 2015-09-02 15:48:44 -07:00
Victor Woeltjen
2f57f47234 Merge pull request #78 from danielpacak/ignore-intellij-project-config-files 
[Build] Ignore Intellij *.iml configuration files
 2015-09-01 16:17:17 -07:00
Victor Woeltjen
59e181c0e5 Merge pull request #65 from danielpacak/tomcat-maven-plugin 
[Build] Start the WAR in an embedded Tomcat Servlet Container
 2015-09-01 16:15:56 -07:00
Shivam Dave
8a5c61e2e6 Merge remote-tracking branch 'upstream/master' into mobile 2015-09-01 14:50:45 -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
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