Skip to content

Commit

Permalink
Build: Update license
Browse files Browse the repository at this point in the history
Closes gh-198
  • Loading branch information
scottgonzalez committed Jun 27, 2014
1 parent 584fa72 commit 43037c9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 291 deletions.
278 changes: 0 additions & 278 deletions GPL-LICENSE.txt

This file was deleted.

7 changes: 6 additions & 1 deletion MIT-LICENSE.txt → LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
Copyright (c) 2011 John Resig, http://jquery.com/
Copyright 2011, 2014 jQuery Foundation and other contributors,
https://jquery.org/

This software consists of voluntary contributions made by many
individuals. For exact contribution history, see the revision history
available at https://github.com/jquery/themeroller.jquerymobile.com

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
12 changes: 0 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,3 @@ Notes on PHP configs for hosted version of jQm ThemeRoller:
2. When a user generates a 'Share Theme' link, the theme.css file is hosted temporarily (The script that stores the files and generates the url also runs a cleanup script to ensure no files older than 30 days are on the server). There must be enough space to accommodate many themes being stored here at once.

3. When a user clicks "Download ZIP" the server must be able to create the zip and its contents, as well as store it temporarily (again self-cleaning script keeps files only 15 seconds old) so it can be downloaded through the browser.



##License

ThemeRoller code may used under the terms of either the MIT License or the GNU General Public License (GPL) Version 2. The MIT License is recommended for most projects. It is simple and easy to understand and it places almost no restrictions on what you can do with a jQuery project.

If the GPL suits your project better you are also free to use a jQuery project under that license.

You don’t have to do anything special to choose one license or the other and you don’t have to notify anyone which license you are using. You are free to use a jQuery project in commercial projects as long as the copyright header is left intact.

Note that the Farbtastic color picker used in this tool is licensed only under the GPL license. http://acko.net/dev/farbtastic

0 comments on commit 43037c9

Please sign in to comment.