Merge v7.8.3 into Dev #2
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ideojs#6644) The fix in videojs#6297 doesn't work where the child to insert before is an element rather than a component, e.g. the video element. Check if the child to insert before is an element, as well as checking if it has an el_
…' keyword (videojs#6603) * Update descritpion of video.js in the package.json file, and add 'hls' keyword * Update package.json Co-authored-by: Steve Heffernan <git@heff.me>
* fix: addChild with index should allow for children that are elements (videojs#6644) The fix in videojs#6297 doesn't work where the child to insert before is an element rather than a component, e.g. the video element. Check if the child to insert before is an element, as well as checking if it has an el_ * docs(README): Update CDN version urls (videojs#6658) * fix(fs): don't set player element css props on native fullscreen (videojs#6673) Fixes videojs#6640 * Update description of video.js in the package.json file, and add 'hls' keyword (videojs#6603) * Update descritpion of video.js in the package.json file, and add 'hls' keyword * Update package.json Co-authored-by: Steve Heffernan <git@heff.me> Co-authored-by: mister-ben <git@misterben.me> Co-authored-by: Soroush Chehresa <s1996ch@gmail.com> Co-authored-by: Gary Katsevman <git@gkatsev.com> Co-authored-by: Owen Edwards <owen.r.edwards@gmail.com> Co-authored-by: Steve Heffernan <git@heff.me>
|
too many conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The fix in videojs#6297 doesn't work where the child to insert before is an element rather than a component, e.g. the video element.
Check if the child to insert before is an element, as well as checking if it has an el_
docs(README): Update CDN version urls (Update CDN version videojs/video.js#6658)
fix(fs): don't set player element css props on native fullscreen (fix(fs): don't set player element css props on native fullscreen videojs/video.js#6673)
Fixes videojs#6640
Update description of video.js in the package.json file, and add 'hls' keyword (Update description of video.js in the package.json file, and add 'hls' keyword videojs/video.js#6603)
Update descritpion of video.js in the package.json file, and add 'hls' keyword
Update package.json
Co-authored-by: Steve Heffernan git@heff.me
Co-authored-by: mister-ben git@misterben.me
Co-authored-by: Soroush Chehresa s1996ch@gmail.com
Co-authored-by: Gary Katsevman git@gkatsev.com
Co-authored-by: Owen Edwards owen.r.edwards@gmail.com
Co-authored-by: Steve Heffernan git@heff.me
Description
Please describe the change as necessary.
If it's a feature or enhancement please be as detailed as possible.
If it's a bug fix, please link the issue that it fixes or describe the bug in as much detail.
Specific Changes proposed
Please list the specific changes involved in this pull request.
Requirements Checklist