ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,975 Commits 7 Branches 235 Tags
Commit Graph

503 Commits

Author SHA1 Message Date
Sam Potts
da943b384c Merge branch 'develop' into css-variables 
# Conflicts:
#	demo/dist/demo.css
#	demo/dist/demo.min.js.map
#	demo/index.html
#	dist/plyr.css
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs.map
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs.map
#	gulpfile.js
#	src/sass/base.scss
#	src/sass/components/control.scss
#	src/sass/settings/colors.scss
#	src/sass/settings/controls.scss
 2020-03-30 10:45:57 +11:00
Sam Potts
09598f07bf Merge branch 'develop' of github.com:sampotts/plyr into develop 
# Conflicts:
#	package.json
#	yarn.lock
 2020-03-29 12:02:59 +11:00
Sam Potts
2f26c80c88
Merge pull request #1739 from ydylla/ignore-internal-play-promises 
Ignore internal play promises
 2020-03-29 11:18:08 +11:00
ydylla
6a1d6f13a2 add promise footnote to togglePlay 2020-03-23 22:56:37 +01:00
Sam Potts
fcd82088a5
Update readme.md 2020-03-14 12:46:33 +11:00
Sam Potts
c9b6d9685c
Update readme.md 2020-03-14 12:46:05 +11:00
jess
b7367d8275
Add financial contributors for Open Collective 
Hi, I'm making updates for Open Collective. Either you or another core contributor signed this repository up for Open Collective. This pull request adds financial contributors from your Open Collective https://opencollective.com/plyr ❤️

  What it does:
  - adds a badge to show the latest number of financial contributors
  - adds a banner displaying contributors to the project on GitHub
  - adds a banner displaying all individuals contributing financially on Open Collective
  - adds a section displaying all organizations contributing financially on Open Collective, with their logo and a link to their website

P.S: As with any pull request, feel free to comment or suggest changes.

  Thank you for your great contribution to the Open Source community. You are awesome! 🙌
  And welcome to the Open Collective community! 😊

  Come chat with us in the #opensource channel on https://slack.opencollective.com - great place to ask questions and share best practices with other Open Source sustainers!
 2020-03-13 18:25:13 -07:00
Nisar Hassan Naqvi
425b39a762 simplify code contributions by fully automating the dev setup with gitpod 2020-02-17 04:21:35 +00:00
Sam Potts
206e3b57d1 v3.5.10 2020-02-14 17:37:32 +00:00
Sam Potts
04d06f2242 v3.5.9 deployed 2020-02-14 17:00:33 +00:00
Sam Potts
a6ff0274a9 v3.5.8 deployed 2020-02-10 18:38:54 +00:00
Sam Potts
db05322ba2
Merge pull request #1670 from ydylla/previewThumbnails-setter 
Add previewThumbnails source setter
 2020-02-10 11:28:20 +00:00
Sam Potts
bb7f7d5e2a 3.5.7 2020-02-09 21:59:40 +00:00
Sam Potts
3e3186cfeb Update docs for speed options tweaks 2020-02-09 21:42:27 +00:00
ydylla
d7d0f5fca0 add previewThumbnails to source setter docs 2020-02-09 17:03:31 +01:00
Sam Potts
818e1efd43 Deployed 3.5.7-beta.0 2020-01-30 14:56:52 +00:00
Sam Potts
521e8abf88
Merge pull request #1654 from thatrobotdev/patch-3 
Fix broken link to new plugin
 2020-01-22 11:31:02 +00:00
Sam Potts
9fe03c7474
Merge pull request #1655 from laukstein/patch-1 
Uncaught RangeError: Maximum call stack size exceeded
 2020-01-22 11:30:19 +00:00
James Kerrane
1b8c51f45e
Fix broken link to new plugin 
Fix broken link, and update to an active project replacement https://github.com/chintan9/plyr-react.
 2020-01-21 23:15:18 -07:00
Sam Potts
d00d31961e
Merge pull request #1484 from MaxGiting/patch-1 
Improve clarity
 2020-01-13 16:32:43 +00:00
Sam Potts
b2ac730572
Merge pull request #1535 from skerbis/master 
adds: REDAXO CMS Plyr AddOn
 2020-01-13 16:29:41 +00:00
Sam Potts
63d74eee68
Merge pull request #1560 from 0xflotus/develop 
Update readme.md
 2020-01-13 16:23:39 +00:00
Sam Potts
6b0e5cd6f1 Merge branch 'master' into develop 2020-01-13 16:18:38 +00:00
Sam Potts
8736fa8a52 Manually port over change from PR #1625 2020-01-13 16:04:27 +00:00
Sam Potts
93963d3915
Merge pull request #1630 from pjbaert/patch-1 
Typo in readme
 2020-01-13 15:56:27 +00:00
Sam Potts
c15bdabf0c
Update readme.md 2020-01-12 21:35:40 +00:00
Pieter-Jan Baert
80a077c50a
Typo in readme 2019-12-06 16:00:48 +01:00
ayunami2000
e6e391ad6a
typo 
change s to z in "Customisable" (now "Customizable")
 2019-10-14 15:59:01 -04:00
0xflotus
dce665b792
Update readme.md 2019-09-01 18:39:37 +02:00
Thomas Skerbis
91503d3698
Update readme.md 2019-08-15 21:55:22 +02:00
Thomas Skerbis
1721f6e9e2
Update readme.md 2019-08-15 21:53:41 +02:00
MaxGiting
a2bf974058
Improve clarity 2019-07-01 15:09:29 +01:00
Sam Potts
7c442c9357 3.5.6 2019-06-21 12:35:47 +10:00
Sam Potts
dfc09b8e04 v3.5.5 deployed 2019-06-21 00:24:28 +10:00
Sam Potts
e8e2b8ba39 Merge branch 'master' into develop 
# Conflicts:
#	.eslintrc
#	demo/dist/demo.css
#	demo/dist/demo.js
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs
#	dist/plyr.min.mjs.map
#	dist/plyr.mjs
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs
#	dist/plyr.polyfilled.min.mjs.map
#	dist/plyr.polyfilled.mjs
#	package.json
#	readme.md
#	src/js/listeners.js
#	yarn.lock
 2019-06-20 23:56:19 +10:00
Sam Potts
2e40b91ec1 Styling tweaks for demo 2019-06-20 23:50:46 +10:00
Sam Potts
c9055f391b Linting changes 2019-06-01 18:45:07 +10:00
Jason Cooke
99c95363b4
docs: fix typo 2019-06-01 11:13:44 +12:00
Sam Potts
80aa6ffe43 Linting changes 2019-04-30 23:44:05 +10:00
Sam Potts
0694e58650 v3.5.4 2019-04-25 12:14:48 +10:00
Sam Potts
c3fd822857 Notes on autoplay support 2019-04-25 12:01:15 +10:00
Sam Potts
2bd08cdc28 3.5.3 2019-04-12 18:44:05 +10:00
Sam Potts
9f30d54963 Merge branch 'master' into develop 
# Conflicts:
#	readme.md
 2019-04-12 12:40:12 +10:00
Sam Potts
b247093495 Aspect ratio improvements (fixes #1042, fixes #1366) 2019-04-12 12:19:48 +10:00
Sam Potts
6e68ad6d15
Update readme.md 2019-03-26 21:43:59 +11:00
Sam Potts
5b7a025d26 Housekeeping 2019-03-16 11:57:15 +11:00
Sam Potts
4c3bf25b8a Fixed issue where the preview thumbnail was present while scrubbing 2019-02-24 12:10:20 +11:00
Sam Potts
215fc3677a v3.5.1 2019-02-23 13:14:01 +11:00
Sam Potts
80990c98c8 Deployed v3.5.0 2019-02-19 01:25:39 +11:00
Sam Potts
44d3a17870 Fix links 2019-02-19 01:17:08 +11:00