463f7ccf65
[Timeline] Use indexes instead of UUIDs
2016-05-25 12:07:35 -07:00
87fe407739
Merge branch 'master' into csv-export-update-751
2016-05-25 12:00:43 -07:00
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
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
37a417051d
Merge remote-tracking branch 'origin/missing-time-conductor-957'
2016-05-25 11:43:57 -07:00
97d819739c
Merge pull request #956 from nasa/fix-build-mct-popup
...
Resolve build conflict from #922
2016-05-25 11:41:14 -07:00
3935378b0c
Revert "[Timeline] Test mct-representation ordering"
...
This reverts commit 2a4004fd5b
2016-05-25 11:34:29 -07:00
952f95aa4c
[Timeline] Update failing specs
2016-05-25 11:33:51 -07:00
0a75a5be1f
[Timeline] Add minimal test case
2016-05-25 11:28:00 -07:00
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
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
bb4f1ce7cd
[Timeline] Include utilization columns
2016-05-25 10:52:25 -07:00
0cc2ba7595
[Timeline] Import UtilizationColumn
2016-05-25 10:38:00 -07:00
8162429106
[Timeline] Pass in resources extensions
2016-05-25 10:37:01 -07:00
ed519d89d7
[Timeline] Log errors during CSV export
...
#751
2016-05-25 10:35:29 -07:00
0e4f6185b8
Merge branch 'master' into csv-export-update-751
...
Conflicts:
platform/features/timeline/bundle.js
2016-05-25 10:29:56 -07:00
05b4f5401e
Merge remote-tracking branch 'origin/open890'
2016-05-25 10:19:11 -07:00
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
2330f1d135
Merge remote-tracking branch 'origin/open907'
2016-05-25 10:06:55 -07:00
ff92d3acab
Merge remote-tracking branch 'origin/open889' into open922
2016-05-25 09:55:09 -07:00
32d7187db6
Relocated creation package to edit bundle
2016-05-24 17:08:12 -07:00
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
3795570938
[Timeline] Rename shadowing variable
2016-05-24 12:45:25 -07:00
362248a02e
[Timeline] Run gulp fixstyle
2016-05-24 12:37:10 -07:00
16d20eabd2
[Timeline] Simplify method
2016-05-24 12:33:47 -07:00
eb5566f041
[Timeline] Add tests for timeline zoom changes
2016-05-24 12:33:19 -07:00
757da1dff4
[Timeline] Remove obsolete test cases
2016-05-24 11:54:49 -07:00
85432af187
[Timeline] Don't store zoom configuration
...
https://github.com/nasa/openmct/issues/936#issuecomment-221343620
2016-05-24 11:53:27 -07:00
f0ab817e87
Added tests, and fixed failing ones
2016-05-24 10:53:04 -07:00
96af931c0b
Modified EditActionPolicy to prevent editing of table views unless object is a table type
2016-05-23 16:48:31 -07:00
9a5209f7c2
[Timeline] Add zoom-to-fit button
2016-05-23 16:06:10 -07:00
0818a7cda0
[Timeline] Increase maximum zoom level
...
#936
2016-05-23 15:36:26 -07:00
f35947361c
[Timeline] Remain centered during zoom
...
#936
2016-05-23 15:32:48 -07:00
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
eff46b076c
[New Edit Mode] #628 Removed duplicate logic from Create Action
2016-05-23 15:03:20 -07:00
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
1c007ea256
[Code Style] Remove trailing whitespace
...
...to fix build after changes for #142 .
2016-05-23 14:55:04 -07:00
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
6c1412784b
[Example] REMS heirarchy appear as links
2016-05-20 17:11:07 -07:00
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
5b6ea600ba
Merge pull request #930 from nasa/open633
...
[New Edit Mode] #633 Remove Editing workflow concerns from FixedController, LayoutController
2016-05-20 16:10:46 -07:00
fd9d766913
Defer resolution of scope in DropGesture
2016-05-20 15:15:18 -07:00
b6502e9ea1
[New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController
2016-05-20 14:12:24 -07:00
25a2321578
Merge pull request #927 from nasa/jscs-rebase-142
...
[Code Style] Enforce code style
2016-05-20 14:03:27 -07:00
6fb36374f6
Merge pull request #942 from nasa/persist-graph-toggles-908
...
[Timeline] Persist resource graph toggles
2016-05-20 13:27:41 -07:00
9861e63589
[Code Style] Run fixstyle on merged changes
2016-05-20 13:09:16 -07:00
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
ad5691142e
[Code Style] Rename shadowing variables
2016-05-20 13:05:32 -07:00
e468080373
[Code Style] Disallow outer shadowing
...
031a46aa8e (commitcomment-17561082)
2016-05-20 11:38:36 -07:00
c98c36753c
Merge pull request #944 from nasa/open943
...
[Build] Ignore gh-pages from circle-ci
2016-05-20 10:54:01 -07:00
