ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-09 22:42:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,511 Commits 992 Branches 212 Tags 192 MiB
5babf7274d
Commit Graph

1764 Commits

Author SHA1 Message Date
Pete Richards
14f1a1f740 Merge remote-tracking branch 'origin/open1031' 2016-07-18 11:43:55 -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
Charles Hacskaylo
4087b9cdde [Frontend] Styling for Time Conductor v2 
Fixes #933
WIP: Fixed look for Firefox
 2016-07-15 14:39:29 -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
Charles Hacskaylo
43a804eef4 [Frontend] Styling for Time Conductor v2 
Fixes #933
WIP: Added zoom current range indicator;
tweaks to style
 2016-07-15 07:54:32 -07:00
Charles Hacskaylo
b3a4f52fe2 [Frontend] Styling for Time Conductor v2 
Fixes #933
WIP: Adding zoom control with HTML5
input range type; Refactored sass slightly
to move display: inline-block out of mixin
containerBase and into .s-btn.
 2016-07-14 18:30:49 -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
Charles Hacskaylo
671e3016d4 [Frontend] Styling for Time Conductor v2 
Fixes #933
New _animations scss include, moved
scss around.
 2016-07-14 16:40:05 -07:00
Victor Woeltjen
99227d2e42 [Persistence] Finish testing TransactionManager 2016-07-14 16:39:50 -07:00
Charles Hacskaylo
379828315f [Frontend] Styling for Time Conductor v2 
Fixes #933
New _animations scss include, moved
scss around.
 2016-07-14 16:39:27 -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
Charles Hacskaylo
8c5538ec4d [Frontend] Styling for Time Conductor v2 
Fixes #933
"Sticky" clock anim for LAD mode
 2016-07-14 14:58:18 -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
Charles Hacskaylo
8b694ef337 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: color/size tweaks, fixes for espresso
theme
 2016-07-13 19:42:51 -07:00
Charles Hacskaylo
33b2225d10 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: restructured markup to move
modeModel farther out; animated icon
 2016-07-13 18:48:17 -07:00
Charles Hacskaylo
fcfda50e73 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: color tweaks, bar sizing,
field widths
 2016-07-13 15:00:16 -07:00
Charles Hacskaylo
06af84c161 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: fixed SVG text color, field
styling for fixed vs. real-time, markup cleanup
 2016-07-13 13:14:32 -07:00
Charles Hacskaylo
5238aa2731 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress; fixed SVG text color
 2016-07-13 08:07:59 -07:00
Henry
c8898ac6aa [Documentation] Updated copyright statement. Fixes #1081 2016-07-12 16:55:57 -07:00
Henry
088416905d Added duration 2016-07-12 10:08:08 -07:00
Charles Hacskaylo
64ce8a2b2a [Frontend] Styling for Time Conductor v2 
Fixes #933
Color adjusts, mini super-menu size
and font tweaks, glyphs added to selector,
SVG style fixes in progress
 2016-07-11 14:03:41 -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
Charles Hacskaylo
bf0e85a94c [Frontend] Styling for Time Conductor v2 
Fixes #933
Renamed main class; removed unused <style>
defs
 2016-07-11 11:35:26 -07:00
Charles Hacskaylo
7b7b21d748 [Frontend] Styling of Time Conductor v2 
Fixes #933
Tweaks to language; tweak to class name in markup
 2016-07-11 11:05:47 -07:00
Charles Hacskaylo
0a0bc55f5f [Frontend] Styling for Time Conductor v2 
Fixes #993
In-progress; mode menu names and
descriptors modified, markup cleaned up
 2016-07-08 17:11:43 -07:00
Charles Hacskaylo
cf83040c4b [Frontend] Styling for Time Conductor v2 
Fixes #993
In-progress; Create menu refactoring and new
mini Create menu
 2016-07-08 16:54:49 -07:00
Charles Hacskaylo
32f7bc86af [Frontend] Styling for Time Conductor v2 
Fixes #993
In-progress; class renaming continued,
cleanups in markup file, in-page styles
ported to scss
 2016-07-08 16:54:13 -07:00
Henry
bca5eb0fdb [Time Conductor] #933 Initial markup 2016-07-07 09:47:46 -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
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
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
48b271b7ca [Edit] Unshadow variable name 
...to satisfy JSHint
 2016-06-22 16:14:49 -07:00
Victor Woeltjen
e42b8d22f7 [Edit] Undirty objects on refresh 
Remove domain objects from the active transaction when they
are refreshed, and use this from the SaveAsAction to prevent
saving unintended changes. Fixes #1046
 2016-06-22 15:32:37 -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
Henry
c0311be192 [Browse] Inspector shown when object switched to edit mode. Fixes #1031 2016-06-20 20:27:56 -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
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
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
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
Pete Richards
3480809129 Merge remote-tracking branch 'origin/open629' 2016-06-14 10:44:58 -07:00
Pete Richards
d759401b69 Merge remote-tracking branch 'origin/open1000' 2016-06-14 10:38:51 -07: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
Andrew Henry
29dd51439d [Date Input] Addressed issues with date selector. Fixes #1000 2016-06-08 17:37:26 +01: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
Charles Hacskaylo
808ccd0376 [Frontend] Tweaks to splitter 
Fixes #913
- IN PROGRESS: working on making
smaller splitter in Timelines
 2016-06-02 16:23:42 -07:00
Andrew Henry
f167022eea Changed logic of persisted check slightly 2016-06-02 10:26:38 +01:00
Charles Hacskaylo
76edba1014 [Frontend] Mods to Edit button 
fixes #709
- Changed title and style of main Edit button;
- Updated EditItem.js protractor ID accordingly;
 2016-06-01 19:19:58 -07:00
Charles Hacskaylo
7904989a23 [Frontend] Added transitional animation to Edit mode 
fixes #709
- When going from browse to edit mode, the wrapper
around the object being edited will now transition in
from its edges, and the edit controls toolbar will
animate its height;
- There is no transition applied for going from edit
to browse; to do this we'd need to mod the JS on
exiting to look for the end of an animation event;
- Tested in Chrome, Safari and Firefox;
- May not be smooth with very complex objects
like Layouts with a large number of components;
- Added transitional animations to .l-object-wrapper
and .l-edit-controls;
- New 'animTo' mixin added to _effects.scss;
 2016-06-01 19:18:55 -07:00
Victor Woeltjen
ea676b4368 Merge remote-tracking branch 'origin/master' into table-export-934 2016-06-01 10:33:53 -07:00
Andrew Henry
b1266abf01 [Edit] Fixed issue with cancel action throwing an error. Fixes #979 2016-06-01 10:41:01 +01:00
Charles Hacskaylo
8b9c51f303 [Frontend] Styling Export button 
fixes #973
- Done;
- Styling for Export button and tabular view
area in layout frame context;
- Export button in frame context now
hidden until user hovers over tabular
view area in frame, includes animated
transition;
- Normalized line-height on button and
menu elements in frame context;
- Layout/markup/SASS for historical and
RT tabular view modified;
- Converted imagery.html layout
to use flexbox;
 2016-05-31 11:40:31 -07:00
Charles Hacskaylo
661b3d5889 [Frontend] Styling Export button 
fixes #973
- In progress:
- Added new download symbol to symbols font;
- Added export symbol to export button;
- Layout/markup/SASS for historical tabular
view modified;
 2016-05-31 09:50:12 -07:00
Andrew Henry
dc577d4c24 Merge pull request #974 from nasa/open970 
R&I open970: hide nav-to-parent arrow when in Edit mode
 2016-05-27 14:56:48 -07:00
Andrew Henry
8f7a5e113b Merge pull request #951 from nasa/orphan-navigation-765 
[Navigation] Prevent navigation to orphan objects
 2016-05-27 14:53:33 -07:00
Charles Hacskaylo
9820f9d9c5 [Frontend] Mod CSS to properly hide nav-to-parent when editing 
fixes #970
Not sure what problem was, but betting this was due to removal
of an ng-class previously in markup;
 2016-05-26 12:45:25 -07:00
Victor Woeltjen
56ff98cce7 Merge branch 'master' into orphan-navigation-765 2016-05-26 12:35:48 -07:00
Henry
eda1f23df9 [Edit Mode] #629 rewriting disabled tests 2016-05-26 11:38:12 -07:00
Charles Hacskaylo
f1113fda24 [Frontend] New message for unsaved changes warning 
open #747
 2016-05-26 09:04:40 -07:00
Andrew Henry
eefd4c8669 Merge pull request #949 from nasa/info-error-948 
[Mobile] Remove usage of element.scope()
 2016-05-25 15:15:53 -07:00
Henry
7501f679f7 [Style] Fixed style issues introduced by #954 2016-05-25 12:10:39 -07:00
Victor Woeltjen
52e087d8f8 Merge pull request #954 from nasa/open628 
[Edit Mode] #628 Remove edit related concerns from Create Action
 2016-05-25 11:55:17 -07:00
Pete Richards
2ff0c7b06a [Test] Add spy method for addClass 
Add spy method, fix a merge conflict that was improperly resolved
in https://github.com/nasa/openmct/pull/922
 2016-05-25 10:11:34 -07:00
Pete Richards
ff92d3acab Merge remote-tracking branch 'origin/open889' into open922 2016-05-25 09:55:09 -07:00
Henry
32d7187db6 Relocated creation package to edit bundle 2016-05-24 17:08:12 -07:00
Henry
f0ab817e87 Added tests, and fixed failing ones 2016-05-24 10:53:04 -07:00
Henry
96af931c0b Modified EditActionPolicy to prevent editing of table views unless object is a table type 2016-05-23 16:48:31 -07:00
Henry
eff46b076c [New Edit Mode] #628 Removed duplicate logic from Create Action 2016-05-23 15:03:20 -07:00
Victor Woeltjen
1ced47fc2c [Navigation] Prevent navigation to orphan objects 
This is particularly useful when a persistence failure has caused
a created object not to be added to its parent container. #765
 2016-05-23 14:07:09 -07:00
Victor Woeltjen
6e7f4df5e3 [Mobile] Remove usage of element.scope() 
Usage is unnecessary and is sensitive to initialization ordering of
representations, resulting in #948.
 2016-05-20 16:13:51 -07:00
Henry
b6502e9ea1 [New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController 2016-05-20 14:12:24 -07:00
Victor Woeltjen
9861e63589 [Code Style] Run fixstyle on merged changes 2016-05-20 13:09:16 -07:00
Victor Woeltjen
bce5643994 Merge branch 'master' into jscs-rebase-142 
Conflicts:
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/representation/src/MCTRepresentation.js
 2016-05-20 13:07:58 -07:00
Victor Woeltjen
ad5691142e [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
Victor Woeltjen
1419ff86e8 Merge pull request #946 from nasa/open636 
[New Edit Mode] #636 Removed edit concerns from DropGesture
 2016-05-20 10:52:11 -07:00
Henry
601bc03ba2 [New Edit Mode] #636 Modified EditAndCompose action to rely on a slightly refactored EditActionPolicy to remove folder specific logic 2016-05-20 10:42:17 -07:00
Henry
776586ae25 [New Edit Mode] #634 Removed edit concerns from MctRepresentation 2016-05-19 17:09:56 -07:00
Victor Woeltjen
fa77139077 [Code Style] Run gulp fixstyle 
...to apply code style settings from #142.
 2016-05-19 11:29:13 -07:00
Victor Woeltjen
de43aa81be Merge pull request #838 from nasa/open824_rebase 
[Edit] #824 - Remove EditableDomainObject
 2016-05-18 17:01:24 -07:00
Charles Hacskaylo
a729edd399 [Frontend] Label context arrows now always visible 
open #929
- Also enable frame dragging in title area when
editing in Layout;
- CSS and markup changes;
 2016-05-16 12:00:29 -07:00
Henry
54a0de4a08 [New Edit Mode] #636 Removed edit concerns from DropGesture 2016-05-13 17:59:43 -07:00
Henry
a11dba88b2 [New Edit Mode] #634 Removed edit concerns from MctRepresentation 2016-05-12 20:23:33 -07:00
Henry
d08cdfba49 Fixed linting issues 2016-05-12 16:50:19 -07:00
Henry
ffacf6e1ae Resolved residual merge issue 2016-05-12 16:18:48 -07:00