From ad341c976c70d3dc006e5ba99478ff9041573de2 Mon Sep 17 00:00:00 2001 From: David DeSandro Date: Fri, 10 Apr 2015 14:06:38 -0400 Subject: [PATCH] fresh license and install info --- README.mdown | 32 +++++++++++++++++++++++--------- changelog.md | 3 +++ js/isotope.js | 6 +++++- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/README.mdown b/README.mdown index de6cca5..a2e827d 100644 --- a/README.mdown +++ b/README.mdown @@ -6,24 +6,38 @@ See [isotopejs.com](http://isotopejs.com) for complete docs and demos. ## Install -A packaged source file includes everything you need to use Isotope. +### Download -+ [isotope.pkgd.js](http://isotope.metafizzy.co/isotope.pkgd.js) -+ [isotope.pkgd.min.js](http://isotope.metafizzy.co/isotope.pkgd.min.js) ++ [isotope.pkgd.js](https://github.com/metafizzy/isotope/raw/master/dist/isotope.pkgd.js) un-minified, or ++ [isotope.pkgd.min.js](https://github.com/metafizzy/isotope/raw/master/dist/isotope.pkgd.min.js) minified -If you are cool with the command line... +### CDN -Install with [Bower](http://bower.io): `bower install isotope` +Link directly to [Isotope files on cdnjs](https://cdnjs.com/libraries/jquery.isotope). -[Install with npm](https://www.npmjs.org/package/isotope-layout): `npm install isotope-layout` +``` html + + + +``` + +### Package managers + +Bower: `bower install isotope --save` + +npm: `npm install isotope-layout --save` ## License -Isotope may be used in commercial projects and applications with the one-time purchase of a commercial license. If you are paid to do your job, and part of your job is implementing Isotope, a commercial license is required. +### Commerical license + +If you want to use Isotope to develop commercial sites, themes, projects, and applications, the Commercial license is the appropriate license. With this option, your source code is kept proprietary. Purchase a Isotope Commercial License at [isotope.metafizzy.co](http://isotope.metafizzy.co/#commerical-license) + +### Open source license -http://isotope.metafizzy.co/license.html +If you are creating an open source application under a license compatible with the [GNU GPL license v3](https://www.gnu.org/licenses/gpl-3.0.html), you may use Isotope under the terms of the GPLv3. -For non-commercial, personal, or open source projects and applications, you may use Isotope under the terms of the [GPL v3 License](http://choosealicense.com/licenses/gpl-v3/). You may use Isotope for free. +[Read more about Isotope's license](http://isotope.metafizzy.co/license.html). ## Initialize diff --git a/changelog.md b/changelog.md index 9cbb079..13d7e73 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ # Changelog ++ Changed `bower.json` `main` to just `js/isotope.js`. Resolved [#879](https://github.com/metafizzy/isotope/issues/879) ++ Added [fizzy-ui-utils](https://github.com/metafizzy/fizzy-ui-utils) + ### v2.1.1 + Refactored hide/reveal logic with filtering diff --git a/js/isotope.js b/js/isotope.js index dc20fce..8d095ef 100644 --- a/js/isotope.js +++ b/js/isotope.js @@ -1,7 +1,11 @@ /*! * Isotope v2.1.1 - * Filter & sort magical layouts + * + * Licensed GPLv3 for open source use + * or Isotope Commercial License for commercial use + * * http://isotope.metafizzy.co + * Copyright 2015 Metafizzy */ ( function( window, factory ) {