ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 13:17:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,264 Commits 989 Branches 212 Tags 191 MiB
9fa6184b0a
Commit Graph

4264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Hacskaylo
9fa6184b0a [Frontend] Markup / Angular mods to Search 
Fixes #1093
WIP: markup changes. Needs CSS mods effected in
#1047 as well.
 2016-07-19 15:23:22 -07:00
Pete Richards
14f1a1f740 Merge remote-tracking branch 'origin/open1031' 2016-07-18 11:43:55 -07:00
Pete Richards
5a6c209369 Merge branch 'jesusprubio-open1036' 2016-07-18 11:39:04 -07:00
Pete Richards
8c2ce81b76 Merge branch 'open1036' of https://github.com/jesusprubio/openmct into jesusprubio-open1036 2016-07-18 11:37:00 -07:00
Pete Richards
99ec188813 Merge remote-tracking branch 'origin/open254' 2016-07-18 11:35:43 -07:00
Pete Richards
41d0089e53 Merge remote-tracking branch 'origin/open1065' 2016-07-18 11:19:55 -07:00
Pete Richards
8ed9f51008 Merge remote-tracking branch 'origin/open1075-fixed' 2016-07-18 11:17:05 -07:00
Andrew Henry
6176ca2260 Merge pull request #1084 from nasa/transaction-clearing-1059 
[Persistence] Clear transactions selectively
 2016-07-15 16:20:19 -07:00
Victor Woeltjen
eb6ddb5e45 [Persistence] Use ids from TransactionManager API 
Recommended during code review,
https://github.com/nasa/openmct/pull/1084#discussion_r71021889
 2016-07-15 12:26:35 -07:00
Andrew Henry
c5041db1d1 Merge pull request #1083 from nasa/contextualize-624 
[Context] Remove excessive warnings
 2016-07-15 11:05:52 -07:00
Henry
307b678707 [Fixed] Create new object type based on Telemetry Panel 'Fixed' view. Fixes #1075 2016-07-14 17:00:13 -07:00
Victor Woeltjen
550e60455b [Persistence] Fix code style 2016-07-14 16:49:31 -07:00
Victor Woeltjen
d263b80810 [Persistence] Add TransactionManager JSDoc 
Fixes #1059 (or, rather, concludes work on said fix)
 2016-07-14 16:47:36 -07:00
Victor Woeltjen
99227d2e42 [Persistence] Finish testing TransactionManager 2016-07-14 16:39:50 -07:00
Victor Woeltjen
31264aadda [Persistence] Begin testing TransactionManager 2016-07-14 16:28:27 -07:00
Victor Woeltjen
11a2fbacb4 [Persistence] Add test cases 
Adds test cases for TransactionalPersistenceCapability which brings
coverage up to 100%.
 2016-07-14 16:22:25 -07:00
Victor Woeltjen
7c865f87be [Persistence] Update transactional persistence spec 
...to account for changes to separate out transaction management,
including removal of specs made obsolete (as tested behavior has
been moved to TransactionManager or was already redundant to
behavior from the undecorated PersistenceCapability)
 2016-07-14 16:20:29 -07:00
Victor Woeltjen
86fcf19066 [Persistence] Update Save As spec 
...to account for asynchrony in test case due to usage of
Promise.all
 2016-07-14 16:14:20 -07:00
Victor Woeltjen
1f7cece8ec [Persistence] Remove unused variable 2016-07-14 15:05:43 -07:00
Victor Woeltjen
a731c35ad6 [Persistence] Refactor out transaction management 2016-07-14 13:43:55 -07:00
Victor Woeltjen
c7529dd56b [Persistence] Share transaction clearing functions 2016-07-14 12:53:58 -07:00
Victor Woeltjen
00fff52529 [Persistence] Track persist-pending state globally 2016-07-14 12:50:36 -07:00
Victor Woeltjen
4c7ad6d93a Merge branch 'undirty-on-refresh-1046' into transaction-clearing-1059 
Conflicts:
	platform/commonUI/edit/src/actions/SaveAsAction.js
 2016-07-14 11:53:39 -07:00
Victor Woeltjen
eb5493e37b [Persistence] Revert quick-fix for persistence clearing 
Revert "Squashed commit of the following:"

This reverts commit d1c01d3c86.
 2016-07-14 11:51:59 -07:00
Victor Woeltjen
1fb18c7919 [Context] Add test, tweak logic 
Add test to verify that warnings are not shown based on
composition/location inconsistencies when editing.
 2016-07-14 11:16:07 -07:00
Victor Woeltjen
1c2378b3b4 [Context] Suppress warnings while editing 
Don't expect consistency between composition and location fields
while an object is being edited; this avoids benign warnings
being logged. Fixes #624
 2016-07-14 11:10:15 -07:00
Andrew Henry
cd21575546 [Documentation] Minor punctuation change, and added links 2016-07-13 08:57:52 -07:00
Andrew Henry
f9d6b9fe5d Merge pull request #1044 from pacozaa/master 
[Documentation] Improve README.md in Build section
 2016-07-13 08:50:29 -07:00
pacozaa
407766774d [Documentation] Add Building and Running Open MCT Locally Section from #1044 comment 2016-07-13 15:05:11 +07:00
Henry
c8898ac6aa [Documentation] Updated copyright statement. Fixes #1081 2016-07-12 16:55:57 -07:00
Pete Richards
d05a1cef9b Merge pull request #1060 from nasa/clear-transactions-1046-squashed 
[Edit] Clear transactions on Save As
 2016-07-11 12:25:09 -07:00
pacozaa
12b5544959 [Documentation] Edit as Reqeust in #1044 comment 2016-07-09 20:49:05 +07:00
Henry
59e18b9a79 [Search] Amended ClickAwayController to trigger digest via instead of . Fixes #1065 2016-06-30 14:44:39 -07:00
Henry
ea1780364b [Dialog Service] Dismiss individual dialogs. Fixes #254 2016-06-29 20:12:12 -07:00
pacozaa
eef08ccb0b [Documentation]Add convince messages 2016-06-28 13:05:28 +07:00
pacozaa
8a9edd3705 [Documentation] Add Official site 2016-06-28 12:51:12 +07:00
Pete Richards
652a50c700 Merge remote-tracking branch 'origin/open1018-new' 2016-06-27 09:13:03 -07:00
Victor Woeltjen
d1c01d3c86 Squashed commit of the following: 
commit 3f199a9f06
Merge: 27fe4ed 736cba7
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Mon Jun 27 09:04:40 2016 -0700

    Merge remote-tracking branch 'origin/master' into clear-transactions-1046

    Conflicts:
    	platform/commonUI/edit/src/actions/SaveAsAction.js

commit 27fe4edb30
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 15:04:06 2016 -0700

    [Edit] Mark restartTransaction as private API

commit 21d1938a0f
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 15:03:17 2016 -0700

    [Edit] Clarify JSDoc

commit 06a83f9fa9
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 15:01:35 2016 -0700

    [Edit] Update failing spec

commit 1f525160e0
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 14:52:43 2016 -0700

    [Edit] Refer to correct variable

    ...when clearing transactions after a restartTransaction

commit b60e94bce4
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 14:38:54 2016 -0700

    [Edit] Clear transactions on Save As

    ...such that only persistence calls associated with the
    saved clones are actually issued. Fixes #1046.
 2016-06-27 09:12:57 -07:00
Sarin
8cf7ffc7cc [Documentation] Add How is NASA Using Open MCT?, Features, See Open MCT in Action, Getting Started Sections 2016-06-27 17:11:27 +07:00
Sarin
b57fc2a0e3 [Documentation] Add getting started section 2016-06-27 16:51:55 +07:00
Victor Woeltjen
736cba76bb Merge pull request #1056 from nasa/blocking-save-dialog 
[Save] Show blocking dialog
 2016-06-26 11:07:03 -07:00
Andrew Henry
2339560363 [Time Conductor] Bounds updated when date selected from date selector. Fixes #1018 2016-06-24 21:50:59 -07:00
Pete Richards
24e870a126 [Save] Show blocking dialog 
Show a blocking dialog while the save action is being performed.

Prevents users from pressing save a second time or performing
further actions while a save is in progress.

Fixes https://github.jpl.nasa.gov/MissionControl/vista/issues/362
 2016-06-24 20:01:52 -07:00
Victor Woeltjen
8bdf1e3072 [Build] Bump version number 
...and restore SNAPSHOT status, to begin sprint Le Guin,
https://github.com/nasa/openmct/milestones/Le%20Guin
 2016-06-24 15:42:10 -07:00
Victor Woeltjen
e8e9598721 [Build] Remove SNAPSHOT status 
...to close sprint Kress,
https://github.com/nasa/openmct/milestones/Kress
 2016-06-24 15:37:23 -07:00
Andrew Henry
ce87ad2564 Merge pull request #916 from ev1stensberg/patch-2 
[Branding] Added Apache license to README.md
 2016-06-23 11:43:16 -07:00
Andrew Henry
2a2f6e8142 Merge pull request #915 from ev1stensberg/patch-1 
[Functionality] Log app instance to the console
 2016-06-23 11:24:53 -07:00
Andrew Henry
3e5057c285 Merge pull request #1015 from mockingjamie/master 
Proofread readme.md
 2016-06-23 11:24:04 -07:00
Victor Woeltjen
48b271b7ca [Edit] Unshadow variable name 
...to satisfy JSHint
 2016-06-22 16:14:49 -07:00
Victor Woeltjen
8244e435bf [Edit] Update failing spec 2016-06-22 16:13:26 -07:00