Skip to content
Permalink
Browse files

Simplify licensing.

  • Loading branch information...
scottgonzalez committed Aug 9, 2012
1 parent bde4392 commit 485ca7192ac57d018b8ce4f03e7dec6e694a53b7
Showing with 55 additions and 340 deletions.
  1. +0 −278 GPL-LICENSE.txt
  2. +1 −4 grunt.js
  3. +2 −6 package.json
  4. +1 −1 tests/jquery.simulate.js
  5. +1 −1 themes/base/jquery.ui.accordion.css
  6. +1 −1 themes/base/jquery.ui.all.css
  7. +1 −1 themes/base/jquery.ui.autocomplete.css
  8. +1 −1 themes/base/jquery.ui.base.css
  9. +1 −1 themes/base/jquery.ui.button.css
  10. +1 −1 themes/base/jquery.ui.core.css
  11. +1 −1 themes/base/jquery.ui.datepicker.css
  12. +1 −1 themes/base/jquery.ui.dialog.css
  13. +1 −1 themes/base/jquery.ui.menu.css
  14. +1 −1 themes/base/jquery.ui.progressbar.css
  15. +1 −1 themes/base/jquery.ui.resizable.css
  16. +1 −1 themes/base/jquery.ui.selectable.css
  17. +1 −1 themes/base/jquery.ui.slider.css
  18. +1 −1 themes/base/jquery.ui.spinner.css
  19. +1 −1 themes/base/jquery.ui.tabs.css
  20. +1 −1 themes/base/jquery.ui.theme.css
  21. +1 −1 themes/base/jquery.ui.tooltip.css
  22. +1 −1 ui/jquery.ui.accordion.js
  23. +1 −1 ui/jquery.ui.autocomplete.js
  24. +1 −1 ui/jquery.ui.button.js
  25. +1 −1 ui/jquery.ui.core.js
  26. +1 −1 ui/jquery.ui.datepicker.js
  27. +1 −1 ui/jquery.ui.dialog.js
  28. +1 −1 ui/jquery.ui.draggable.js
  29. +1 −1 ui/jquery.ui.droppable.js
  30. +1 −1 ui/jquery.ui.effect-blind.js
  31. +1 −1 ui/jquery.ui.effect-bounce.js
  32. +1 −1 ui/jquery.ui.effect-clip.js
  33. +1 −1 ui/jquery.ui.effect-drop.js
  34. +1 −1 ui/jquery.ui.effect-explode.js
  35. +1 −1 ui/jquery.ui.effect-fade.js
  36. +1 −1 ui/jquery.ui.effect-fold.js
  37. +1 −1 ui/jquery.ui.effect-highlight.js
  38. +1 −1 ui/jquery.ui.effect-pulsate.js
  39. +1 −1 ui/jquery.ui.effect-scale.js
  40. +1 −1 ui/jquery.ui.effect-shake.js
  41. +1 −1 ui/jquery.ui.effect-slide.js
  42. +1 −1 ui/jquery.ui.effect-transfer.js
  43. +1 −1 ui/jquery.ui.effect.js
  44. +1 −1 ui/jquery.ui.menu.js
  45. +1 −1 ui/jquery.ui.mouse.js
  46. +1 −1 ui/jquery.ui.position.js
  47. +1 −1 ui/jquery.ui.progressbar.js
  48. +1 −1 ui/jquery.ui.resizable.js
  49. +1 −1 ui/jquery.ui.selectable.js
  50. +1 −1 ui/jquery.ui.slider.js
  51. +1 −1 ui/jquery.ui.sortable.js
  52. +1 −1 ui/jquery.ui.spinner.js
  53. +1 −1 ui/jquery.ui.tabs.js
  54. +1 −1 ui/jquery.ui.tooltip.js
  55. +1 −1 ui/jquery.ui.widget.js

This file was deleted.

@@ -114,7 +114,7 @@ function createBanner( files ) {
"<%= grunt.template.today('isoDate') %>\n" +
"<%= pkg.homepage ? '* ' + pkg.homepage + '\n' : '' %>" +
"* Includes: " + (files ? fileNames.join(", ") : "<%= stripDirectory(grunt.task.current.file.src[1]) %>") + "\n" +
"* Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
"* Copyright <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
" Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */";
}

@@ -158,7 +158,6 @@ grunt.initConfig({
dist: {
src: [
"AUTHORS.txt",
"GPL-LICENSE.txt",
"jquery-*.js",
"MIT-LICENSE.txt",
"README.md",
@@ -204,7 +203,6 @@ grunt.initConfig({
cdn: {
src: [
"AUTHORS.txt",
"GPL-LICENSE.txt",
"MIT-LICENSE.txt",
"ui/*.js",
"package.json"
@@ -247,7 +245,6 @@ grunt.initConfig({
themes: {
src: [
"AUTHORS.txt",
"GPL-LICENSE.txt",
"MIT-LICENSE.txt",
"package.json"
],
@@ -6,7 +6,7 @@
"homepage": "http://jqueryui.com",
"author": {
"name": "jQuery Foundation and other contributors",
"url": "http://jqueryui.com"
"url": "https://github.com/jquery/jquery-ui/blob/master/AUTHORS.txt"
},
"maintainers": [
{
@@ -43,11 +43,7 @@
"licenses": [
{
"type": "MIT",
"url": "http://www.opensource.org/licenses/MIT"
},
{
"type": "GPL",
"url": "http://www.opensource.org/licenses/GPL-2.0"
"url": "https://github.com/jquery/jquery-ui/blob/master/MIT-LICENSE.txt"
}
],
"dependencies": {},
@@ -3,7 +3,7 @@
* http://jqueryui.com
*
* Copyright 2012 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses.
* Released under the MIT license.
* http://jquery.org/license
*/

@@ -3,7 +3,7 @@
* http://jqueryui.com
*
* Copyright 2012 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses.
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Accordion#theming
@@ -3,7 +3,7 @@
* http://jqueryui.com
*
* Copyright 2012 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses.
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Theming
@@ -3,7 +3,7 @@
* http://jqueryui.com
*
* Copyright 2012 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses.
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Autocomplete#theming
@@ -3,7 +3,7 @@
* http://jqueryui.com
*
* Copyright 2012 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses.
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Theming
@@ -3,7 +3,7 @@
* http://jqueryui.com
*
* Copyright 2012 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses.
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Button#theming
@@ -3,7 +3,7 @@
* http://jqueryui.com
*
* Copyright 2012 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses.
* Released under the MIT license.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Theming/API

0 comments on commit 485ca71

Please sign in to comment.
You can’t perform that action at this time.