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

Switch to bsd license #1060

Merged
merged 4 commits into from
Apr 8, 2017
Merged

Switch to bsd license #1060

merged 4 commits into from
Apr 8, 2017

Conversation

blakemurdock
Copy link
Contributor

@blakemurdock blakemurdock commented Apr 6, 2017

Please make sure you provide the information below:

Converting to the BSD License from the CC license

Short description of changes:

This PR added the license and updated all dist/ level minified files to reference the new license.

Breaking in the external API:

N/A

Breaking changes in the internal API:

N/A

Todos/Notes:

Need to update wavesurfer-js.org to reflect these changes

Related Issues and other PRs:

#1050

Copy link
Contributor

@thijstriemstra thijstriemstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also forget the README and bower.json.

LICENSE Outdated
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2017, katspaugh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say katspaugh and contributors. And look up when first commit of project was done and use that in copyright date, e.g. 2014-2017

package.json Outdated
@@ -15,7 +15,7 @@
"url": "git://github.com/katspaugh/wavesurfer.js.git"
},
"author": "",
"license": "CC-BY-3.0",
"license": "BSD 3-Clause License",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

incorrect identifier, it should be BSD-3-Clause.

@blakemurdock
Copy link
Contributor Author

@thijstriemstra I am seeing the miss on the bower.json. Where else is needed for the README? I changed the license mentions there.

@thijstriemstra
Copy link
Contributor

thijstriemstra commented Apr 6, 2017

https://github.com/katspaugh/wavesurfer.js#license (ah yes, missed that, you fixed that already)

I suggest you do a grep for 'Creative commons' through all files, probably are more.

@blakemurdock
Copy link
Contributor Author

That's the original README from the katspaugh repo. The change is in my fork:
https://github.com/blakemurdock/wavesurfer.js/blob/d4868431acfc60c9dfb3e148b60bb2e5ef59e1aa/README.md

I'll run the grep while fixing the other changes to fully verify I haven't missed anything else.

@@ -99,11 +99,11 @@ <h1 itemprop="name">Media Element Fallback Example</h1>

<div class="footer row">
<div class="col-sm-12">
<a rel="license" href="https://creativecommons.org/licenses/by/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/3.0/80x15.png" /></a>
<a rel="license" href="https://opensource.org/licenses/BSD-3-Clause"><img alt="BSD--Clause License" style="border-width:0" src="https://img.shields.io/badge/License-BSD%203--Clause-blue.svg" /></a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the 3 is missing in the img alt for all examples.

@thijstriemstra thijstriemstra changed the title Add bsd license Switch to bsd license Apr 6, 2017
@thijstriemstra thijstriemstra merged commit 01c851a into katspaugh:master Apr 8, 2017
@katspaugh
Copy link
Owner

Thanks much, @blakemurdock and @thijstriemstra!

@thijstriemstra
Copy link
Contributor

@katspaugh lets release it as 1.4.0?

@katspaugh
Copy link
Owner

Released 👍

@blakemurdock blakemurdock deleted the add-bsd-license branch April 10, 2017 15:12
mspae pushed a commit to mspae/wavesurfer.js that referenced this pull request Aug 18, 2017
* Create LICENSE

Adding the BSD license.

* Change all references to CC license to point to the new BSD license

* Extend the license through the examples directory
mspae pushed a commit that referenced this pull request Aug 19, 2017
* Create LICENSE

Adding the BSD license.

* Change all references to CC license to point to the new BSD license

* Extend the license through the examples directory
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants