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
Victor Woeltjen
85432af187
[Timeline] Don't store zoom configuration
...
https://github.com/nasa/openmct/issues/936#issuecomment-221343620
2016-05-24 11:53:27 -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
Victor Woeltjen
9a5209f7c2
[Timeline] Add zoom-to-fit button
2016-05-23 16:06:10 -07:00
Victor Woeltjen
0818a7cda0
[Timeline] Increase maximum zoom level
...
#936
2016-05-23 15:36:26 -07:00
Victor Woeltjen
f35947361c
[Timeline] Remain centered during zoom
...
#936
2016-05-23 15:32:48 -07:00
Victor Woeltjen
9a8bcc0550
[Code Style] Specify lint, codestyle in CircleCI config
...
...to work around unexpected failure running test suite via gulp verify,
https://circleci.com/gh/nasa/openmct/1981
2016-05-23 15:10:05 -07:00
Henry
eff46b076c
[New Edit Mode] #628 Removed duplicate logic from Create Action
2016-05-23 15:03:20 -07:00
Victor Woeltjen
ab64b682c3
[Code Style] Run checkstyle on CircleCI
...
Run the full gulp verify task for testing on CircleCI, to handle
unit tests as well as code style checks and linting (and other
verification steps that may be added in the future.)
2016-05-23 14:58:23 -07:00
Victor Woeltjen
1c007ea256
[Code Style] Remove trailing whitespace
...
...to fix build after changes for #142 .
2016-05-23 14:55:04 -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
Henry
6c1412784b
[Example] REMS heirarchy appear as links
2016-05-20 17:11:07 -07:00
