Skip to content

Commit

Permalink
Updates license to use "LGPLv2.1 (or later) _or_ MIT"
Browse files Browse the repository at this point in the history
  • Loading branch information
kevindb committed Aug 9, 2017
1 parent 9fdc5c9 commit 0762c5b
Show file tree
Hide file tree
Showing 10 changed files with 557 additions and 198 deletions.
523 changes: 502 additions & 21 deletions LICENSE

Large diffs are not rendered by default.

165 changes: 0 additions & 165 deletions LICENSE-LGPLv3

This file was deleted.

21 changes: 21 additions & 0 deletions LICENSE-MIT
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2017 jquery-form

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ See [CONTRIBUTORS](CONTRIBUTORS.md) for details.

## License

This project is dual licensed under the MIT and LGPLv3 licenses:
This project is dual licensed under the LGPLv2.1 (or later) or MIT licenses:

* [MIT](LICENSE)
* [GNU Lesser General Public License v3.0](LICENSE-LGPLv3)
* [GNU Lesser General Public License v2.1](LICENSE)
* [MIT](LICENSE-MIT)

---

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The jQuery Form Plugin allows you to easily and unobtrusively upgrade HTML forms to use AJAX.",
"main": "src/jquery.form.js",
"moduleType": [ "globals", "amd", "node" ],
"license": "(MIT OR LGPL-3.0)",
"license": "(LGPL-2.1+ OR MIT)",
"ignore": [
"README.md",
"composer.json",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The jQuery Form Plugin allows you to easily and unobtrusively upgrade HTML forms to use AJAX.",
"keywords": [ "jquery", "ajax", "jquery-plugin", "json", "json-form", "html-form", "form", "jquery-form" ],
"homepage": "https://github.com/jquery-form/form",
"license": "(MIT OR LGPL-3.0)",
"license": "(LGPL-2.1+ OR MIT)",
"authors": [
{ "name": "Kevin Morris" },
{ "name": "Mike Alsup" }
Expand Down
17 changes: 14 additions & 3 deletions dist/jquery.form.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jquery.form.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"keywords": [ "jquery", "ajax", "jquery-plugin", "json", "json-form", "html-form", "form", "jquery-form", "ecosystem:jquery" ],
"homepage": "https://github.com/jquery-form/form",
"bugs": "https://github.com/jquery-form/form/issues",
"license": "(MIT OR LGPL-3.0)",
"license": "(LGPL-2.1+ OR MIT)",
"contributors": [
"Mike Alsup",
"Kevin Morris"
Expand Down
15 changes: 13 additions & 2 deletions src/jquery.form.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,22 @@
* jQuery Form Plugin
* version: 4.2.1
* Requires jQuery v1.7.2 or later
* Project repository: https://github.com/jquery-form/form
* Copyright 2017 Kevin Morris
* Copyright 2006 M. Alsup
* Project repository: https://github.com/jquery-form/form
* Dual licensed under the MIT and LGPLv3 licenses.
* Dual licensed under the LGPL-2.1+ or MIT licenses
* https://github.com/jquery-form/form#license
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
/* global ActiveXObject */

Expand Down

0 comments on commit 0762c5b

Please sign in to comment.