Victor Woeltjen
d15d27af73
Merge branch 'master' into table-export-934
2016-05-26 10:42:35 -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
438511c5f7
[Table] Test CSV Export behavior
2016-05-25 15:07:17 -07:00
Victor Woeltjen
3eb960cf5a
[Table] Move export button out of scroll
2016-05-25 14:50:06 -07:00
Victor Woeltjen
699f6ba458
[Table] Export table contents as CSV
2016-05-25 13:54:10 -07:00
Victor Woeltjen
f21f22d95c
[Table] Tweak appearance of export button
2016-05-25 13:43:44 -07:00
Victor Woeltjen
b520d08818
[Table] Begin work on CSV export
...
#934
2016-05-25 13:23:19 -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
Victor Woeltjen
7c11f2db4f
Merge pull request #961 from nasa/open959
...
[Style] Fixed style issues introduced by #954
2016-05-25 12:16:44 -07:00
Victor Woeltjen
23c71b7218
[Timeline] Include units for utilizations
2016-05-25 12:12:11 -07:00
Henry
7501f679f7
[Style] Fixed style issues introduced by #954
2016-05-25 12:10:39 -07:00
Victor Woeltjen
463f7ccf65
[Timeline] Use indexes instead of UUIDs
2016-05-25 12:07:35 -07:00
Victor Woeltjen
87fe407739
Merge branch 'master' into csv-export-update-751
2016-05-25 12:00:43 -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
Andrew Henry
c5cd495fce
Merge pull request #952 from nasa/fix-build-142
...
[Code Style] Run code style checks on CircleCI
2016-05-25 11:49:54 -07:00
Pete Richards
37a417051d
Merge remote-tracking branch 'origin/missing-time-conductor-957'
2016-05-25 11:43:57 -07:00
Victor Woeltjen
97d819739c
Merge pull request #956 from nasa/fix-build-mct-popup
...
Resolve build conflict from #922
2016-05-25 11:41:14 -07:00
Victor Woeltjen
3935378b0c
Revert "[Timeline] Test mct-representation ordering"
...
This reverts commit 2a4004fd5b
2016-05-25 11:34:29 -07:00
Victor Woeltjen
952f95aa4c
[Timeline] Update failing specs
2016-05-25 11:33:51 -07:00
Victor Woeltjen
0a75a5be1f
[Timeline] Add minimal test case
2016-05-25 11:28:00 -07:00
Victor Woeltjen
70b593e28a
[Timeline] Watch for configuration object
...
...to address #908 in a manner which does not cause #957
2016-05-25 11:22:22 -07:00
Victor Woeltjen
ed69a65f9b
[Representation] Restore ordering in mct-representation
...
Revert "[Timeline] Change ordering in mct-representation"
This reverts commit 20ecf168f2#957
2016-05-25 11:03:32 -07:00
Victor Woeltjen
bb4f1ce7cd
[Timeline] Include utilization columns
2016-05-25 10:52:25 -07:00
Victor Woeltjen
0cc2ba7595
[Timeline] Import UtilizationColumn
2016-05-25 10:38:00 -07:00
Victor Woeltjen
8162429106
[Timeline] Pass in resources extensions
2016-05-25 10:37:01 -07:00
Victor Woeltjen
ed519d89d7
[Timeline] Log errors during CSV export
...
#751
2016-05-25 10:35:29 -07:00
Victor Woeltjen
0e4f6185b8
Merge branch 'master' into csv-export-update-751
...
Conflicts:
platform/features/timeline/bundle.js
2016-05-25 10:29:56 -07:00
Pete Richards
05b4f5401e
Merge remote-tracking branch 'origin/open890'
2016-05-25 10:19:11 -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
2330f1d135
Merge remote-tracking branch 'origin/open907'
2016-05-25 10:06:55 -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
Victor Woeltjen
00534f8af7
[Timeline] Account for tick size
...
Account for tick size in duration reported by TimelineZoomController,
to avoid tick marks being cut off prematurely due to changes for
#936
2016-05-24 13:02:30 -07:00
Victor Woeltjen
3795570938
[Timeline] Rename shadowing variable
2016-05-24 12:45:25 -07:00
Victor Woeltjen
362248a02e
[Timeline] Run gulp fixstyle
2016-05-24 12:37:10 -07:00
Victor Woeltjen
16d20eabd2
[Timeline] Simplify method
2016-05-24 12:33:47 -07:00
Victor Woeltjen
eb5566f041
[Timeline] Add tests for timeline zoom changes
2016-05-24 12:33:19 -07:00
Victor Woeltjen
757da1dff4
[Timeline] Remove obsolete test cases
2016-05-24 11:54:49 -07:00
