[
http://opencast.jira.com/browse/MH-7700?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=27332#comment-27332
]
Adam Hochman edited comment on MH-7700 at 6/23/11 5:45 PM:
-----------------------------------------------------------
Markus I tried to merge the patch and I encountered a bunch of errors. please
try merging with 1.1.x tomorrow and test. This is now an rb.
patching file shared-resources/css/watch.css
patching file shared-resources/js/watch.js
patching file shared-resources/js/engage_plugins/search.js
patching file shared-resources/js/engage_plugins/segments_ui-plugin.js
patching file shared-resources/js/engage_plugins/annotation_chapter.js
patching file shared-resources/js/engage_plugins/segments_ui.js
Hunk #2 FAILED at 332.
Hunk #3 succeeded at 349 (offset 4 lines).
Hunk #4 FAILED at 444.
2 out of 4 hunks FAILED -- saving rejects to file
shared-resources/js/engage_plugins/segments_ui.js.rej
patching file shared-resources/js/engage_plugins/description.js
patching file shared-resources/js/engage_plugins/segments.js
patching file shared-resources/js/engage_plugins/analytics.js
patching file shared-resources/js/engage_plugins/segments_text.js
patching file shared-resources/js/engage_plugins/series.js
patching file shared-resources/js/embed.js
Hunk #2 FAILED at 254.
Hunk #3 succeeded at 354 (offset 18 lines).
Hunk #4 succeeded at 506 (offset 18 lines).
Hunk #5 succeeded at 530 (offset 18 lines).
Hunk #6 succeeded at 659 (offset 18 lines).
1 out of 6 hunks FAILED -- saving rejects to file
shared-resources/js/embed.js.rej
patching file shared-resources/js/utils.js
patching file
shared-resources/player/engage-hybrid-player/player-multi-hybrid-initialize.js
patching file
shared-resources/player/engage-hybrid-player/player-multi-hybrid.js
Adam-Hochmans-MacBook-Pro:1.1.x adam$ emacs
shared-resources/js/engage_plugins/segments_ui.js.rej
was (Author: ahochman):
Markus I tried to merge the patch and I encountered a bunch of errors.
please try merging with 1.1.x tomorrow and test. This is now an rb.
> Engage can't play .mp4's?
> -------------------------
>
> Key: MH-7700
> URL: http://opencast.jira.com/browse/MH-7700
> Project: Matterhorn Project
> Issue Type: Bug
> Components: Engage Tools
> Affects Versions: 1.1
> Reporter: Hank Magnuski
> Assignee: Markus Ketterl
> Priority: Release Blocker
> Fix For: 1.1.1, 1.2
>
> Attachments: Matterhorn-Engage-Message.tiff,
> MH-7700_patchfor1.1.x.diff, ncast-workflow-dist-stream-mp4.xml,
> workflow-dist-mp4.xml
>
>
--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn
To unsubscribe please email
[email protected]
_______________________________________________
