7c11f2db4f
Merge pull request #961 from nasa/open959
...
[Style] Fixed style issues introduced by #954
2016-05-25 12:16:44 -07:00
7501f679f7
[Style] Fixed style issues introduced by #954
2016-05-25 12:10:39 -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
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
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
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
6c1412784b
[Example] REMS heirarchy appear as links
2016-05-20 17:11:07 -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
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
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
ea454d65bb
Merge pull request #945 from nasa/open634
...
[New Edit Mode] #634 Removed edit concerns from MctRepresentation
2016-05-20 10:06:50 -07:00
776586ae25
[New Edit Mode] #634 Removed edit concerns from MctRepresentation
2016-05-19 17:09:56 -07:00
78bf804e02
[Build] Ignore gh-pages from circle-ci
2016-05-19 15:31:16 -07:00
2a4004fd5b
[Timeline] Test mct-representation ordering
...
Verify that a configuration object has been added to scope before
changing templates. #908
2016-05-19 15:09:57 -07:00
b5229d7786
[Timeline] Commit changes on toggle
...
#908
2016-05-19 15:06:06 -07:00
20ecf168f2
[Timeline] Change ordering in mct-representation
...
...such that the configuration property is available in scope
when a view is first instantiated. #908
2016-05-19 15:00:12 -07:00
dc348f33c5
Merge pull request #940 from nasa/openmct-website
...
[Website] Fixed failed circle.yml command
2016-05-19 14:18:55 -07:00
b7cfaf6b63
Fixed failed circle.yml command
2016-05-19 13:52:58 -07:00
34d5bc4f28
Merge pull request #939 from nasa/openmct-website
...
[Website] #901 Automate build process
2016-05-19 13:24:22 -07:00
e4b192001f
Changed circle.yml to go back to command-based deployment to heroku as cannot use 'heroku' deployment support and commands in the same deployment descriptor
2016-05-19 12:14:42 -07:00
516b8c9e38
[Website] #901 Automate build process - Updated build SHA
2016-05-19 11:39:08 -07:00
f9631ff4c5
[Code Style] Fix style missed by gulp fixstyle
...
...and remove an unnecessary comment, too.
2016-05-19 11:29:41 -07:00
fa77139077
[Code Style] Run gulp fixstyle
...
...to apply code style settings from #142 .
2016-05-19 11:29:13 -07:00
f12b9704d9
Merge branch 'master' into jscs-rebase-142
2016-05-19 11:28:16 -07:00
edb158f2d3
[Website] Added push to website repo
2016-05-19 10:44:58 -07:00
