Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master edge merge #659

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e9a369d
fix: publish
tsi Jan 3, 2024
363aea6
chore(master): release 1.10.5
github-actions[bot] Jan 3, 2024
7968a61
Update CHANGELOG.md
tsi Jan 3, 2024
feb8f06
Merge pull request #511 from cloudinary/release-please--branches--mas…
tsi Jan 3, 2024
3e4a429
Merge branch 'master' into edge-1.10.6
tsi Feb 13, 2024
6b7ae3f
Merge pull request #554 from cloudinary/edge-1.10.6
tsi Feb 13, 2024
edcc655
fix: update CHANGELOG.md (#555)
tsi Feb 13, 2024
00cdf07
chore(master): release 1.10.6 (#556)
cloudinary-jenkins Feb 13, 2024
2915691
Update Master (#579)
cloudinary-jenkins Mar 17, 2024
f6e5871
chore: update master (#580)
cloudinary-jenkins Mar 17, 2024
a6da706
chore: update master (#581)
cloudinary-jenkins Mar 17, 2024
da08ef2
chore(master): release 1.11.0 (#582)
cloudinary-jenkins Mar 17, 2024
efbee25
fix: styled subtitles browser compatibility (#576)
cloudinary-jenkins Mar 19, 2024
f5582fa
chore(master): release 1.11.1 (#586)
cloudinary-jenkins Mar 19, 2024
cca439b
perf!: default export to be base videoPlayer
tsi Apr 14, 2024
acf3e86
chore(master): release 2.0.0 (#618)
cloudinary-jenkins Apr 14, 2024
1fe0f01
chore: update master (#621)
tsi Apr 16, 2024
174ee48
fix: undeprecate Cloudinary.new() (ONCALL-3380) (#619)
tsi Apr 16, 2024
20f0b74
Merge branch 'master' of github.com:cloudinary/cloudinary-video-player
tsi Apr 16, 2024
5bedf61
chore(master): release 2.0.1 (#623)
cloudinary-jenkins Apr 16, 2024
323492f
chore: Update master (#633)
tsi May 9, 2024
a7bbdab
chore(master): release 2.0.2 (#634)
cloudinary-jenkins May 9, 2024
6d58ee1
Merge branch 'edge'
tsi Jun 10, 2024
d5f7a77
Merge branch 'edge'
tsi Jun 10, 2024
1b04cc8
fix: handle live streams (#641)
tsi Jun 10, 2024
694b8e4
Update package.json
tsi Jun 10, 2024
502d3a6
Update package-lock.json
tsi Jun 10, 2024
0232583
Update CHANGELOG.md
tsi Jun 10, 2024
0d40227
Update package-lock.json
tsi Jun 10, 2024
fd3f6a4
Update package.json
tsi Jun 10, 2024
3e1cad5
chore(master): release 2.0.3 (#657)
cloudinary-jenkins Jun 16, 2024
f117854
Merge remote-tracking branch 'origin/edge' into master-edge-merge
jakub-roch Jun 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
415 changes: 41 additions & 374 deletions CHANGELOG.md

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion docs/es-modules/interaction-area.html
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,10 @@ <h3>Auto-zoom video cropping</h3>

<script type="module">
import cloudinary from 'cloudinary-video-player/all';
import 'cloudinary-video-player/cld-video-player.min.css';
import 'cloudinary-video-player/interaction-areas';

import 'cloudinary-video-player/cld-video-player.min.css';

const playerOption = {
cloudName: 'demo',
bigPlayButton: false,
Expand Down
3 changes: 2 additions & 1 deletion docs/es-modules/recommendations.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ <h3 class="mb-4">Recommendations</h3>
</div>

<script type="module">
import { videoPlayer } from 'cloudinary-video-player';
import 'cloudinary-video-player/recommendations-overlay';

import 'cloudinary-video-player/cld-video-player.min.css';
import { videoPlayer } from 'cloudinary-video-player';

const source1 = {
publicId: 'surf_competition',
Expand Down
3 changes: 2 additions & 1 deletion docs/es-modules/shoppable.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ <h3 class="mb-4">Shoppable Videos</h3>
</div>

<script type="module">
import 'cloudinary-video-player/cld-video-player.min.css';
import { videoPlayer } from 'cloudinary-video-player';
import 'cloudinary-video-player/shoppable';

import 'cloudinary-video-player/cld-video-player.min.css';

const player = videoPlayer('player', {
cloudName: 'demo'
});
Expand Down
3 changes: 2 additions & 1 deletion docs/es-modules/subtitles-and-captions.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,10 @@ <h4 class="mt-4 mb-2">Karaoke player</h4>

<script type="module">
import { videoPlayer } from 'cloudinary-video-player';
import 'cloudinary-video-player/cld-video-player.min.css';
import 'cloudinary-video-player/playlist';

import 'cloudinary-video-player/cld-video-player.min.css';

const player = videoPlayer('player', {
cloudName: 'demo'
});
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cloudinary-video-player",
"version": "2.0.4-edge.0",
"version": "2.0.3",
"description": "Cloudinary Video Player",
"author": "Cloudinary",
"license": "MIT",
Expand Down
4 changes: 4 additions & 0 deletions src/assets/styles/components/text-tracks.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
> div {
margin: 3% !important;
}
// Word highlight
&.cld-paced-text-tracks b {
color: var(--color-accent);
}
}
.vjs-text-track-cue {
top: auto !important;
Expand Down
Loading