ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 21:27:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,219 Commits 989 Branches 212 Tags 191 MiB
c8898ac6aa
Commit Graph

4219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Charles Hacskaylo
5485950130 Merge pull request #1049 from nasa/update-plot-squish-margin 
[Plot] Set min height
 2016-06-22 11:36:19 -07:00
Pete Richards
c8f4568bd0 [Plot] Set min height 
Set the min height for the plot element based on user feedback for
minimum plot size that they find useful.  Plot ticks may overlap
but that is expected to be fixed in a future release.

Fixes https://github.com/nasa/openmct/issues/1048
 2016-06-22 10:51:16 -07:00
Victor Woeltjen
cefb40856b Merge pull request #1042 from nasa/open1040 
[Tables] Enabled auto-scroll by default fixes #1040
 2016-06-20 16:24:58 -07:00
Henry
ee7c450e11 [Tables] Enabled auto-scroll by default fixes #1040 2016-06-20 16:18:26 -07:00
Victor Woeltjen
d741e0f23c Merge pull request #1041 from nasa/frontend-1014a 
Emphasis styling applied to Edit button properly
 2016-06-20 16:13:29 -07:00
Charles Hacskaylo
8080490e5c [Frontend] Applied emphasis colors to .key-properties 
fixes #1014
Added .key-properties to .major to color the Edit
button as intended;
 2016-06-20 16:06:23 -07:00
Victor Woeltjen
a3443d8077 Merge pull request #1025 from nasa/frontend-1019 
R&I fixes for Snow button colors and Timeline edit Add menu
 2016-06-20 12:36:29 -07:00
Victor Woeltjen
53e8e7c688 Merge pull request #1024 from nasa/plots-1022 
R&I un-squished plots fix
 2016-06-17 10:36:40 -07:00
Charles Hacskaylo
dea94e4e68 [Frontend] Fix button colors in Snow theme 
Fixes #1014
- Problem was actually application of a color
within the .icon class - fix removes that
definition;
 2016-06-16 17:55:40 -07:00
Charles Hacskaylo
d40c7f1821 [Frontend] Restore the Add menu to edit Timelines 
Fixes #1019
- Removed overflow: hidden from .l-edit-controls;
 2016-06-16 17:46:15 -07:00
Charles Hacskaylo
c7e7e0c302 [Frontend] Fixes to un-squish plots 
Fixes #1022
- min-height added to .gl-plot element;
- Moved plot value definitions out of _plots-main
and into _constants and normalized naming;
 2016-06-16 17:24:44 -07:00
Pete Richards
8ac6ac97f0 Merge remote-tracking branch 'origin/open972' 2016-06-16 11:08:43 -07:00
Victor Woeltjen
1afa4ab329 Merge pull request #1017 from nasa/open664 
[Edit Mode] Canceling edit mode with unsaved changes now shows confirmation dialog to user
 2016-06-16 09:31:37 -07:00
Henry
c2517c1670 [Edit Mode] Canceling edit mode with unsaved changes now shows confirmation dialog to user. Fixes #664 2016-06-15 17:10:29 -07:00
Andrew Henry
717ceff02c Merge pull request #995 from nasa/timeline-913a 
R&I tweaks to Timeline scrollbar and splitters
 2016-06-15 11:45:17 -07:00
Victor Woeltjen
6878c59f45 Merge pull request #1016 from nasa/fix-1013 
[Persistence] Use identifier service to get key
 2016-06-15 11:18:13 -07:00
Pete Richards
c00b053aa7 [Tests] verify that identifier service provides key 
Verify that the results of the identifier service are used for
persistence calls instead of the domain object id.

https://github.com/nasa/openmct/issues/1013
 2016-06-15 10:31:25 -07:00
Victor Woeltjen
480e12c3ab Merge pull request #986 from nasa/table-export-934 
[Table] Add Export for table contents
 2016-06-15 10:17:21 -07:00
Victor Woeltjen
50bd233b0a Merge remote-tracking branch 'origin/master' into table-export-934 
Conflicts:
	platform/commonUI/general/res/sass/controls/_buttons.scss
	platform/features/table/res/templates/mct-table.html
 2016-06-15 10:05:20 -07:00
Henry
79406cf1ed [Tables] #972 Refactored to simplify code. Fixes #972 2016-06-14 16:34:07 -07:00
Pete Richards
2d5824c4ab [Persistence] Use identifier service to get key 
Retrieve key from identifier service for all persist operations.

Fixes https://github.com/nasa/openmct/issues/1013
 2016-06-14 10:56:54 -07:00
Pete Richards
3480809129 Merge remote-tracking branch 'origin/open629' 2016-06-14 10:44:58 -07:00
Pete Richards
11bc48c7e0 Merge remote-tracking branch 'origin/timeline-console-error-978' 2016-06-14 10:41:26 -07:00
Pete Richards
d759401b69 Merge remote-tracking branch 'origin/open1000' 2016-06-14 10:38:51 -07:00
mockingjamie
5a2e5ac48f Merge pull request #1 from mockingjamie/changes-to-readme.md 
Proofread readme.md
 2016-06-13 21:27:43 -04:00
mockingjamie
1144f818cf Proofread readme.md 
Made minor grammatical corrections.
 2016-06-13 21:27:28 -04:00
Victor Woeltjen
0aebecfbb0 Merge pull request #987 from nasa/anim-to-edit-709 
[Frontend] Animation added to transition from browse to edit mode
 2016-06-13 13:31:49 -07:00
Pete Richards
531d40993a Merge remote-tracking branch 'origin/better-dialog-message-339' 2016-06-10 14:55:07 -07:00
Pete Richards
4c097faf88 Merge remote-tracking branch 'origin/timeline-flash-997' 2016-06-10 14:50:36 -07:00
Victor Woeltjen
5152e64895 [Duplicate] Allow copy across spaces 
Fixes #1007
 2016-06-10 11:38:55 -07:00
Victor Woeltjen
0263237b2c Merge pull request #1006 from nasa/open861 
[Tables] Recalculate column dimensions on resize
 2016-06-09 10:21:05 -07:00
Andrew Henry
acd0fae040 [Tables] Recalculate column dimensions on resize. Fixes #861 2016-06-09 12:59:46 +01:00
Andrew Henry
29dd51439d [Date Input] Addressed issues with date selector. Fixes #1000 2016-06-08 17:37:26 +01:00
Victor Woeltjen
a1b2175801 [Timeline] Reduce flicker 
Reposition scroll bar in Timeline with RAF instead of timeout;
this ensures that scroll bar is positioned after the current
digest (updating the width) but before the results are rendered
(avoiding flicker.) Fixes #997
 2016-06-07 10:05:51 -07:00
Victor Woeltjen
b0f06a2195 [Build] Restore SNAPSHOT status 
...to open sprint Kress,
https://github.com/nasa/openmct/milestones/Kress
 2016-06-06 09:57:09 -07:00
Victor Woeltjen
f9c93ca022 [Build] Remove SNAPSHOT status 
To close sprint Huxley,
https://github.com/nasa/openmct/milestones/Huxley
 2016-06-06 09:49:52 -07:00
Charles Hacskaylo
8e0858bb24 [Frontend] Tweaks to splitter dimensions 
Fixes #913
- Tightened up splitter height and width;
- Added hover color for snow theme;
 2016-06-03 10:00:16 -07:00
Victor Woeltjen
ee0fa0451a Merge branch 'master' into timeline-zoom-center-936 
Conflicts:
	platform/features/timeline/src/controllers/TimelineZoomController.js
	platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js
 2016-06-03 09:18:01 -07:00