Skip to content

Commit 3ae56dc

Browse files
committed
Removing licensing under GPL Version 2 (following the jQuery library itself here),
also adding the MIT license to the repository. Closes carhartl#139.
1 parent 0f5a490 commit 3ae56dc

File tree

3 files changed

+33
-11
lines changed

3 files changed

+33
-11
lines changed

CHANGELOG.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@ HEAD
22
----
33
- Configuration options: `raw`, `json`. Replaces raw option, becomes config:
44

5-
```javascript
6-
$.cookie.raw = true; // bypass encoding/decoding the cookie value
7-
$.cookie.json = true; // automatically JSON stringify/parse value
8-
```
9-
Thus the default options now cleanly contain cookie attributes only.
5+
```javascript
6+
$.cookie.raw = true; // bypass encoding/decoding the cookie value
7+
$.cookie.json = true; // automatically JSON stringify/parse value
8+
```
9+
10+
Thus the default options now cleanly contain cookie attributes only.
11+
12+
- Removing licensing under GPL Version 2, the plugin is now released under MIT License only
13+
(following the jQuery library itself here).
1014

1115
1.2.0
1216
-----
1317
- Adding `$.removeCookie('foo')` for deleting a cookie, using `$.cookie('foo', null)` is now deprecated.
1418

1519
1.1
1620
---
17-
- Default options.
21+
- Adding default options.

MIT-LICENSE.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright 2013 Klaus Hartl
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

jquery.cookie.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
/*!
2-
* jQuery Cookie Plugin v1.3
2+
* jQuery Cookie Plugin v1.3.0
33
* https://github.com/carhartl/jquery-cookie
44
*
5-
* Copyright 2011, Klaus Hartl
6-
* Dual licensed under the MIT or GPL Version 2 licenses.
7-
* http://www.opensource.org/licenses/mit-license.php
8-
* http://www.opensource.org/licenses/GPL-2.0
5+
* Copyright 2013 Klaus Hartl
6+
* Released under the MIT license
97
*/
108
(function ($, document, undefined) {
119

0 commit comments

Comments
 (0)