ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 06:52:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,142 Commits 989 Branches 212 Tags 191 MiB
29dd51439d
Commit Graph

4142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Henry
29dd51439d [Date Input] Addressed issues with date selector. Fixes #1000 2016-06-08 17:37:26 +01: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
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
Victor Woeltjen
e86e955682 Merge pull request #993 from nasa/revert-990-timeline-regression-817 
Revert "[Timeline] Provide greater initial width"
 2016-06-02 17:05:11 -07:00
Victor Woeltjen
9913fb48f5 Revert "[Timeline] Provide greater initial width" 2016-06-02 16:54:59 -07:00
Victor Woeltjen
71c362f016 Merge pull request #992 from nasa/revert-991-timeline-regression-817 
Revert "[Timeline] Update scroll position on timeout"
 2016-06-02 16:54:48 -07:00
Victor Woeltjen
fa6e8fd5f9 Revert "[Timeline] Update scroll position on timeout" 2016-06-02 16:49:49 -07:00
Victor Woeltjen
23b64951f3 [Timeline] Update zoom controller spec 
...to reflect changes/simplifications for #936.
 2016-06-02 16:42:09 -07:00
Victor Woeltjen
99590d18f7 [Timeline] Simplify bounds-tracking 2016-06-02 16:40:07 -07:00
Victor Woeltjen
86b31bc040 [Timeline] Simplify scroll-setting 2016-06-02 16:38:11 -07:00
Victor Woeltjen
d52bfed1df [Timeline] Always set scroll on timeout 
...to allow time for width to increase.
 2016-06-02 16:36:09 -07:00
Victor Woeltjen
44d6456de1 [Timeline] Set scroll on timeout 
Whenever timeline zoom controller sets scroll, check to see if
there may be a width violation that causes scroll to be reset,
and retry on a timeout if so. Fixes #936.
 2016-06-02 16:05:28 -07:00
Victor Woeltjen
beeefe517a Merge pull request #991 from nasa/timeline-regression-817 
[Timeline] Update scroll position on timeout
 2016-06-02 15:37:42 -07:00
Victor Woeltjen
d02f4041b2 [Timeline] Update scroll position on timeout 
Fixes #817
 2016-06-02 15:34:32 -07:00
Victor Woeltjen
9fd75ff91e Merge pull request #990 from nasa/timeline-regression-817 
[Timeline] Provide greater initial width
 2016-06-02 14:59:14 -07:00
Victor Woeltjen
026ece3956 [Timeline] Provide greater initial width 
This avoids starting with a scrollable width too small for the
initial scroll position that the zoom controller selects.
Fixes #817
 2016-06-02 14:48:58 -07:00
Andrew Henry
1d6880c283 Merge pull request #982 from nasa/timeline-scroll-981 
[Timeline] Use reasonable width for scroll area
 2016-06-02 16:59:08 +01:00
Andrew Henry
8ddad9bf4c Merge pull request #984 from nasa/open979 
[Edit] Fixed issue with cancel action throwing an error. Fixes #979
 2016-06-02 10:31:20 +01:00
Andrew Henry
f167022eea Changed logic of persisted check slightly 2016-06-02 10:26:38 +01:00
Andrew Henry
b1266abf01 [Edit] Fixed issue with cancel action throwing an error. Fixes #979 2016-06-01 10:41:01 +01:00
Victor Woeltjen
5a2d1a746d [Timeline] Add missing semicolon 2016-05-31 16:27:59 -07:00
Victor Woeltjen
4f0e3fdf85 [Timeline] Test zoom controller's width 2016-05-31 16:21:40 -07:00
Victor Woeltjen
be9f56107c [Timeline] Remove obsolete test cases 2016-05-31 16:15:57 -07:00
Victor Woeltjen
787f3815df [Timeline] Expose width from ZoomController 
...and ensure that the width exposed is not excessively
large; fixes #981
 2016-05-31 16:12:49 -07:00
Victor Woeltjen
35d7d9b380 [Timeline] Remove width method 
...from TimelineController. Will replace with a more straightforward
call to the zoom controller that uses the exposed end time instead,
to address #981.
 2016-05-31 16:05:06 -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
8f9308de01 Merge pull request #962 from nasa/csv-export-update-751 
[Timeline] Updates to CSV Export
 2016-05-27 14:55:59 -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
Victor Woeltjen
dade6b2254 [Timeline] Use positive logic for clarity 
https://github.com/nasa/openmct/pull/962#discussion_r64678013
 2016-05-26 12:12:52 -07:00
Victor Woeltjen
e9cac6eff3 [Timeline] Add JSDoc for new parameter 
https://github.com/nasa/openmct/pull/962#discussion_r64677520
 2016-05-26 12:12:52 -07:00
Andrew Henry
a88b4b31a1 Merge pull request #966 from nasa/open747 
R&I open747: refined "unsaved changes" dialog message
 2016-05-26 12:02:12 -07:00
Victor Woeltjen
5689279954 [Timeline] Add JSDoc for idMap 
https://github.com/nasa/openmct/pull/962#discussion_r64676750
https://github.com/nasa/openmct/pull/962#discussion_r64677198
 2016-05-26 11:53:16 -07:00
Victor Woeltjen
04112956cf Merge pull request #964 from nasa/open913 
R&I open913: various Timeline fixes
 2016-05-26 11:47:06 -07:00
Charles Hacskaylo
f1113fda24 [Frontend] New message for unsaved changes warning 
open #747
 2016-05-26 09:04:40 -07:00
Charles Hacskaylo
33c208d8fe [Frontend] Timeline Gantt bar mods to allow small min-width 
open #965
- CSS adjusted to handle min-width of 2px and better
approach to ellipsizing text;
- Angular ng-class added to hide icon and title if
width less than a value;
- Rounded corners on bars removed;
 2016-05-25 20:52:36 -07:00
Charles Hacskaylo
c557fb6cd5 [Frontend] Cursor properties modified 
open #768
 2016-05-25 19:39:56 -07:00
Charles Hacskaylo
bde2bc7709 [Frontend] Bottom of holder divs adjusted 
open #913
 2016-05-25 19:28:28 -07:00
Andrew Henry
5fe759aa91 Merge pull request #955 from nasa/timeline-zoom-936 
[Timeline] Improve zoom behaviors
 2016-05-25 16:58:20 -07:00
Victor Woeltjen
a5b7badb95 [Timeline] Remove obsolete arguments 
https://github.com/nasa/openmct/pull/955/files#r64668507
 2016-05-25 16:08:28 -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
Victor Woeltjen
f9fd97230f [Timeline] Satisfy JSHint 2016-05-25 12:37:03 -07:00
Victor Woeltjen
536e2290b8 Merge branch 'master' into csv-export-update-751 2016-05-25 12:33:43 -07:00
Victor Woeltjen
73b922facf [Timeline] Update specs for indexes instead of ids 2016-05-25 12:32:44 -07:00
Victor Woeltjen
ba0d9a186b [Timeline] Account for new argument in spec 2016-05-25 12:26:47 -07:00
Victor Woeltjen
80f5cb756d [Timeline] Account for new argument in spec 2016-05-25 12:25:58 -07:00
Victor Woeltjen
d7f566088f [Timeline] Update spec to include logging 2016-05-25 12:25:02 -07:00
Victor Woeltjen
a3bcaea7f9 [Timeline] Show units in utilization headers 2016-05-25 12:21:58 -07:00