aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Potts <me@sampotts.me>2017-05-16 10:17:04 +1000
committerSam Potts <me@sampotts.me>2017-05-16 10:17:04 +1000
commitf3bda17fa0c12007e92f681e5a72512a33a2ac16 (patch)
tree7523e8e19fc50615b3e2973b14090938a6c79a48
parent966c3d875d68a096b6aaa5b86e3b9ae4d93696b5 (diff)
parentc0eee58732d14273b3628f6fa75022aefd6f5546 (diff)
downloadplyr-f3bda17fa0c12007e92f681e5a72512a33a2ac16.tar.lz
plyr-f3bda17fa0c12007e92f681e5a72512a33a2ac16.tar.xz
plyr-f3bda17fa0c12007e92f681e5a72512a33a2ac16.zip
Merge branch 'master' into develop
# Conflicts: # demo/dist/demo.js # demo/src/js/main.js # dist/plyr.js # notes.md # src/js/plyr.js
Diffstat
-rw-r--r--.github/pull_request_template.md8
-rw-r--r--changelog.md4
-rw-r--r--demo/index.html8
-rw-r--r--license.md2
-rw-r--r--package.json8
-rw-r--r--readme.md16
6 files changed, 23 insertions, 23 deletions
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index f1ad850d..c4779d3c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,8 +1,8 @@
-### Link to related issue (if applicable)
+### Link to related issue (if applicable)
-### Sumary of proposed changes
+### Sumary of proposed changes
### Task list
-- [ ] Tested on [supported browsers](https://github.com/Selz/plyr#browser-support)
-- [ ] Gulp build completed \ No newline at end of file
+- [ ] Tested on [supported browsers](https://github.com/sampotts/plyr#browser-support)
+- [ ] Gulp build completed \ No newline at end of file
diff --git a/changelog.md b/changelog.md
index 1fc85a42..46547433 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,8 +1,8 @@
# Changelog
## v2.0.12
-- Ability to set custom `blankUrl` for source changes (https://github.com/Selz/plyr/pull/504)
-- Ability to set caption button listener (https://github.com/Selz/plyr/pull/468)
+- Ability to set custom `blankUrl` for source changes (https://github.com/sampotts/plyr/pull/504)
+- Ability to set caption button listener (https://github.com/sampotts/plyr/pull/468)
## v2.0.11
- Fix for `cleanUp` being called twice (thanks to @sebastiancarlsson)
diff --git a/demo/index.html b/demo/index.html
index 9877cf3c..c844dcd7 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -16,11 +16,11 @@
<body>
<header>
<h1>Plyr</h1>
- <p>A simple, accessible HTML5 media player by <a href="https://twitter.com/sam_potts" target="_blank">@sam_potts</a> from <a href="https://twitter.com/selz" target="_blank">@selz</a></p>
+ <p>A simple, accessible HTML5 media player by <a href="https://twitter.com/sam_potts" target="_blank">@sam_potts</a></p>
<nav>
<ul>
<li>
- <a href="https://github.com/selz/plyr" target="_blank" class="btn btn--large btn--primary" data-shr-network="github">
+ <a href="https://github.com/sampotts/plyr" target="_blank" class="btn btn--large btn--primary" data-shr-network="github">
<svg class="icon"><use xlink:href="#icon-github"/></svg>Download on GitHub
</a>
</li>
@@ -79,10 +79,10 @@
<script src="dist/demo.js"></script>
<!-- Rangetouch to fix <input type="range"> on touch devices (see https://rangetouch.com) -->
- <script src="https://cdn.rangetouch.com/0.0.9/rangetouch.js" async></script>
+ <script src="https://cdn.rangetouch.com/1.0.1/rangetouch.js" async></script>
<!-- Sharing libary (https://shr.one) -->
- <script src="https://cdn.shr.one/0.1.9/shr.js"></script>
+ <script src="https://cdn.shr.one/1.0.1/shr.js"></script>
<script>if(window.shr) { window.shr.setup({ count: { classname: 'btn__count' } }); }</script>
</body>
</html>
diff --git a/license.md b/license.md
index 8531b2bb..2c19ae73 100644
--- a/license.md
+++ b/license.md
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2015 Selz.com
+Copyright (c) 2017 Sam Potts
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/package.json b/package.json
index 72ed32ee..d53cc9ee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "plyr",
- "version": "2.0.12",
+ "version": "2.0.13",
"description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
"homepage": "http://plyr.io",
"main": "src/js/plyr.js",
@@ -35,11 +35,11 @@
],
"repository": {
"type": "git",
- "url": "git://github.com/selz/plyr.git"
+ "url": "git://github.com/sampotts/plyr.git"
},
"license": "MIT",
"bugs": {
- "url": "https://github.com/selz/plyr/issues"
+ "url": "https://github.com/sampotts/plyr/issues"
},
"directories": {
"doc": "readme.md"
@@ -47,5 +47,5 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
- "author": "Sam Potts <sam@selz.com>"
+ "author": "Sam Potts <sam@potts.es>"
}
diff --git a/readme.md b/readme.md
index 48af3933..0fc7ccac 100644
--- a/readme.md
+++ b/readme.md
@@ -39,7 +39,7 @@ Check out the [changelog](changelog.md) to see what's new with Plyr.
- AirPlay
- Picture in Picture (MacOS Sierra + Safari)
-[more info](https://github.com/Selz/plyr/issues?q=is%3Aissue+is%3Aopen+label%3A%22In+Development%22)
+[more info](https://github.com/sampotts/plyr/issues?q=is%3Aissue+is%3Aopen+label%3A%22In+Development%22)
## Planned features
- Playlists
@@ -48,9 +48,9 @@ Check out the [changelog](changelog.md) to see what's new with Plyr.
- Wistia video support
- YouTube and Vimeo audio support
- Audio captions
-...and whatever else has been raised in [issues](https://github.com/Selz/plyr/issues)
+...and whatever else has been raised in [issues](https://github.com/sampotts/plyr/issues)
-If you have any cool ideas or features, please let me know by [creating an issue](https://github.com/Selz/plyr/issues/new) or, of course, forking and sending a pull request.
+If you have any cool ideas or features, please let me know by [creating an issue](https://github.com/sampotts/plyr/issues/new) or, of course, forking and sending a pull request.
## CMS plugins
@@ -137,7 +137,7 @@ Include the `plyr.js` script before the closing `</body>` tag and then call `ply
If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the JavaScript, you can use the following:
```html
-<script src="https://cdn.plyr.io/2.0.12/plyr.js"></script>
+<script src="https://cdn.plyr.io/2.0.13/plyr.js"></script>
```
### CSS
@@ -150,11 +150,11 @@ Include the `plyr.css` stylsheet into your `<head>`
If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the default CSS, you can use the following:
```html
-<link rel="stylesheet" href="https://cdn.plyr.io/2.0.12/plyr.css">
+<link rel="stylesheet" href="https://cdn.plyr.io/2.0.13/plyr.css">
```
### SVG Sprite
-The SVG sprite is loaded automatically from our CDN (provided by [Fastly](https://www.fastly.com/)). To change this, see the [options](#options) below. For reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/2.0.12/plyr.svg`.
+The SVG sprite is loaded automatically from our CDN (provided by [Fastly](https://www.fastly.com/)). To change this, see the [options](#options) below. For reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/2.0.13/plyr.svg`.
## Advanced
@@ -290,7 +290,7 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke
<td><code>blankUrl</code></td>
<td>String</td>
<td><code>https://cdn.selz.com/plyr/blank.mp4</code></td>
- <td>Specify a URL or path to a blank video file used to properly cancel network requests. See <a href="https://github.com/Selz/plyr/issues/174">issue #174</a> for more info.</td>
+ <td>Specify a URL or path to a blank video file used to properly cancel network requests. See <a href="https://github.com/sampotts/plyr/issues/174">issue #174</a> for more info.</td>
</tr>
<tr>
<td><code>debug</code></td>
@@ -1056,7 +1056,7 @@ Any unsupported browsers will display links to download the media if the correct
If you find anything weird with Plyr, please let us know using the GitHub issues tracker.
## Author
-Plyr is developed by [@sam_potts](https://twitter.com/sam_potts) / [sampotts.me](http://sampotts.me) with help from the awesome [contributors](https://github.com/Selz/plyr/graphs/contributors)
+Plyr is developed by [@sam_potts](https://twitter.com/sam_potts) / [sampotts.me](http://sampotts.me) with help from the awesome [contributors](https://github.com/sampotts/plyr/graphs/contributors)
## Donate
Plyr costs money to run, not my time - I donate that for free but domains, hosting and more. Any help is appreciated...
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-08 13:36:52 +0000