Skip to content

Commit

Permalink
change to single MIT license. update banners in source files
Browse files Browse the repository at this point in the history
  • Loading branch information
arshaw committed Mar 11, 2013
1 parent fcacceb commit b7e644b
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 307 deletions.
278 changes: 0 additions & 278 deletions GPL-LICENSE.txt

This file was deleted.

2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ module.exports = function(grunt) {
----------------------------------------------------------------------------------------------------*/

config.copy.misc = {
src: "*.txt", // licenses and changelog
src: "*.txt", // license and changelog
dest: 'build/out/'
};

Expand Down
6 changes: 1 addition & 5 deletions fullcalendar.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@
"licenses": [
{
"type": "MIT",
"url": "https://github.com/arshaw/fullcalendar/blob/master/MIT-LICENSE.txt"
},
{
"type": "GPL",
"url": "https://github.com/arshaw/fullcalendar/blob/master/GPL-LICENSE.txt"
"url": "https://github.com/arshaw/fullcalendar/blob/master/license.txt"
}
],

Expand Down
File renamed without changes.
13 changes: 6 additions & 7 deletions src/common/print.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
/*
/*!
* <%= meta.title %> v<%= meta.version %> Print Stylesheet
*
* Docs & License: <%= meta.homepage %>
* (c) <%= meta.copyright %>
*/

/*
* Include this stylesheet on your page to get a more printer-friendly calendar.
* When including this stylesheet, use the media='print' attribute of the <link> tag.
* Make sure to include this stylesheet IN ADDITION to the regular fullcalendar.css.
*
* (c) <%= meta.copyright %>
* Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
*
*/


Expand Down
5 changes: 1 addition & 4 deletions src/gcal/gcal.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/*!
* <%= meta.title %> v<%= meta.version %> Google Calendar Plugin
*
* Docs & License: <%= meta.homepage %>
* (c) <%= meta.copyright %>
* Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
*
*/

(function($) {
Expand Down
12 changes: 5 additions & 7 deletions src/intro.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
/*!
* <%= meta.title %> v<%= meta.version %>
* <%= meta.homepage %>
*
* Docs & License: <%= meta.homepage %>
* (c) <%= meta.copyright %>
*/

/*
* Use fullcalendar.css for basic styling.
* For event drag & drop, requires jQuery UI draggable.
* For event resizing, requires jQuery UI resizable.
*
* (c) <%= meta.copyright %>
* Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
*
*/

(function($, undefined) {
Expand Down
7 changes: 2 additions & 5 deletions src/main.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/*
/*!
* <%= meta.title %> v<%= meta.version %> Stylesheet
*
* Docs & License: <%= meta.homepage %>
* (c) <%= meta.copyright %>
* Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
*
*/


Expand Down

0 comments on commit b7e644b

Please sign in to comment.