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

chore: update edge from master #791

Closed
wants to merge 55 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
55 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
2202cf2
Master edge merge (#660)
jakub-roch Jun 17, 2024
ac69bbb
fix: use videojs events & re-trigger to analytics package with custom…
jakub-roch Jun 17, 2024
6efe946
Merge branch 'master' of github.com:cloudinary/cloudinary-video-player
tsi Jun 17, 2024
9d65e18
chore(master): release 2.0.4 (#661)
cloudinary-jenkins Jun 17, 2024
d9b6251
chore: update master (#681)
github-actions[bot] Jul 15, 2024
799ea72
chore(master): release 2.0.5 (#682)
cloudinary-jenkins Jul 15, 2024
2aba293
chore: update master (#691)
github-actions[bot] Aug 21, 2024
3af5c2f
chore(master): release 2.1.0 (#694)
cloudinary-jenkins Aug 26, 2024
63e06a9
Merge edge to master1 (#729)
jakub-roch Nov 4, 2024
5807863
fix: edge to master (#730)
jakub-roch Nov 5, 2024
e159b38
chore(master): release 2.1.1 (#731)
cloudinary-jenkins Nov 6, 2024
b163910
chore: update master (#751)
github-actions[bot] Dec 9, 2024
b408157
Merge branch 'master' into update-master-from-edge
tsi Dec 9, 2024
d5ccac5
Merge pull request #752 from cloudinary/update-master-from-edge
tsi Dec 9, 2024
a0a2598
feat: support srt subtitle format (#743)
github-actions[bot] Dec 9, 2024
4782d7c
chore: versioning
tsi Dec 9, 2024
62b2f52
feat: support srt subtitle format (#743)
github-actions[bot] Dec 9, 2024
4b69cc0
feat: support srt subtitle format (#743)
github-actions[bot] Dec 9, 2024
69dceed
chore(master): release 2.2.0 (#760)
cloudinary-jenkins Dec 9, 2024
e0e803e
feat: support srt subtitle format (#743)
github-actions[bot] Jan 7, 2025
071aace
chore(master): release 2.3.0 (#789)
cloudinary-jenkins Jan 7, 2025
70691ea
Merge remote-tracking branch 'origin/master' into edge
tsi Jan 8, 2025
de3083b
chore: e2e remove old ESM external example
tsi Jan 8, 2025
63163ca
chore: cleanup
tsi Jan 8, 2025
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
Prev Previous commit
Next Next commit
feat: support srt subtitle format (#743)
Co-authored-by: Tsachi Shlidor <[email protected]>
  • Loading branch information
github-actions[bot] and tsi authored Dec 9, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit a0a2598b81c12621663c18c73aa18acc7ae93e0e
2 changes: 1 addition & 1 deletion src/plugins/index.js
Original file line number Diff line number Diff line change
@@ -13,14 +13,14 @@ import colors from './colors';
import contextMenu from './context-menu';
import floatingPlayer from './floating-player';
import pacedTranscript from './paced-transcript';
import srtTextTracks from './srt-text-tracks';
import vttThumbnails from './vtt-thumbnails';

// Lazy loaded plugins
import chapters from './chapters';
import imaPlugin from './ima';
import playlist from './playlist';
import shoppable from './shoppable-plugin';
import srtTextTracks from './srt-text-tracks';
import styledTextTracks from './styled-text-tracks';
import interactionAreas from './interaction-areas';