ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 13:43:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,871 Commits 989 Branches 212 Tags 191 MiB
560c8612bd
Commit Graph

1871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Shivam Dave
c4c4c42415 [Elastic] Elastic Bundle 
Elasticsearch bundle.json reverted back to
original.
 2015-08-27 09:11:20 -07:00
slhale
2cd1907b71 [Search] Temporarily hide link icons 
Hide link icons in search results to temporarily
fix issue #84.
 2015-08-26 13:40:28 -07:00
Shivam Dave
e7563ff4e9 [Action] Merge 
Merged with master.
 2015-08-26 10:11:23 -07:00
Shivam Dave
a507557cec [Remove] Remove Action 
Tweaked remove action to return
on finding the object that is being removed and
checking if it can be navigated to. Also completed
tests for RemoveAction.
 2015-08-26 10:07:51 -07:00
Victor Woeltjen
509badb225 Merge pull request #55 from nasa/search 
[Search] Create search UI
 2015-08-25 14:41:19 -07:00
slhale
6571da922d [Search] Update style for link icons 
Added styling to correctly position and color
link icons within the search resutls list.
 2015-08-25 08:56:32 -07:00
slhale
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
Pete Richards
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
Pete Richards
f1ca9ff15e Merge remote-tracking branch 'origin/open1334' into open1416 2015-08-24 11:55:27 -07:00
Pete Richards
9eb23a62bc Merge branch 'open75' into open-master 2015-08-24 10:42:19 -07:00
Pete Richards
9b6a839c06 Merge branch 'open-jpl48' into open-master 2015-08-24 10:39:17 -07:00
Victor Woeltjen
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
Pete Richards
1e332da11b [Docs] ElasticSearch is not Couch 2015-08-24 09:04:03 -07:00
Pete Richards
3a050cc5b8 [Style] space after operator 2015-08-24 09:03:31 -07:00
Shivam Dave
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
Shivam Dave
a7cc06a28b Merge remote-tracking branch 'upstream/master' 2015-08-21 09:08:00 -07:00
Daniel Pacak
1e79c507c8 [Build] Ignore Intellij *.iml configuration files 2015-08-20 09:25:27 +02:00
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Victor Woeltjen
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