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
26839c7fd1
[Persistence] Fix code style after merge
2016-05-20 14:27:53 -07:00
264896c264
Merge branch 'master' into persist-on-mutation-825
...
Conflicts:
platform/commonUI/edit/src/actions/RemoveAction.js
platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
platform/commonUI/edit/test/actions/RemoveActionSpec.js
platform/entanglement/src/services/LinkService.js
platform/features/timeline/src/controllers/drag/TimelineDragHandler.js
platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDecorator.js
platform/features/timeline/test/controllers/drag/TimelineDragHandlerSpec.js
platform/features/timeline/test/controllers/swimlane/TimelineSwimlaneDropHandlerSpec.js
2016-05-20 14:26:39 -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
e3208187bf
Merge branch 'master' into persist-on-mutation-825
...
Conflicts:
platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
2016-05-20 10:59:54 -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
bcf85db9c4
[Persistence] Delegate new 'persisted' method
2016-05-19 13:31:27 -07:00
34d5bc4f28
Merge pull request #939 from nasa/openmct-website
...
[Website] #901 Automate build process
2016-05-19 13:24:22 -07:00
f1e81c359e
[Persistence] Satisfy JSHint
2016-05-19 12:17:20 -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
8279acc9a5
[Persistence] Don't expect persist calls in PropertiesAction spec
2016-05-19 12:04:08 -07:00
63438ad9ba
[Persistence] Don't expect persist calls in LinkAction spec
2016-05-19 12:02:42 -07:00
467f4d2257
[Persistence] Don't expect persist calls in RemoveAction spec
2016-05-19 12:00:51 -07:00
a5aaa6f103
[Persistence] Don't expect persist calls in LocationCapability spec
2016-05-19 11:55:05 -07:00
9b273bc148
[Persistence] Don't expect persist calls in EditRepresenter spec
2016-05-19 11:52:58 -07:00
0aba9122a1
[Persistence] Don't expect persist calls in LinkService spec
2016-05-19 11:51:50 -07:00
ac3706dfb6
[Persistence] Don't expect persist calls in specs
2016-05-19 11:50:12 -07:00
3905171457
[Persistence] Don't expect persist calls in spec
2016-05-19 11:48:16 -07:00
1e03f22086
[Persistence] Don't expect persist calls in spec
2016-05-19 11:46:50 -07:00
360fdeaec8
[Persistence] Don't expect persist calls in spec
2016-05-19 11:44:26 -07:00
d5914dfde9
[Persistence] Remove caching of persistence capability
...
...as this no longer needs to be invoked directly.
2016-05-19 11:42:58 -07:00
d3f2a24267
Merge branch 'master' into persist-on-mutation-825
...
Conflicts:
platform/core/src/capabilities/PersistenceCapability.js
platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
2016-05-19 11:41:08 -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
