From 29c9fe142a210c3f41ee76712769c1feed603944 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 14 Sep 2013 00:35:25 -0400 Subject: [PATCH 1/6] specify required ruby version --- .ruby-version | 1 + Gemfile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..77fee73 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +1.9.3 diff --git a/Gemfile b/Gemfile index 4bc6e3e..98a042b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ source 'https://rubygems.org' +ruby File.read('.ruby-version').strip -gem "github-pages" \ No newline at end of file +gem "github-pages" From 319bd3677e9523ee05502539d942e74adaa3632a Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 14 Sep 2013 00:39:58 -0400 Subject: [PATCH 2/6] upgrade to gh-pages 4 --- .ruby-version | 2 +- Gemfile.lock | 2 +- javascripts/app.js | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.ruby-version b/.ruby-version index 77fee73..227cea2 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -1.9.3 +2.0.0 diff --git a/Gemfile.lock b/Gemfile.lock index 6316c83..2ad15af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GEM highline (~> 1.6.11) directory_watcher (1.4.1) fast-stemmer (1.0.2) - github-pages (1) + github-pages (4) RedCloth (= 4.2.9) jekyll (= 1.1.2) kramdown (= 1.0.2) diff --git a/javascripts/app.js b/javascripts/app.js index f140d3c..be3bca0 100644 --- a/javascripts/app.js +++ b/javascripts/app.js @@ -1,9 +1,8 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var Choosealicense; Choosealicense = (function() { - Choosealicense.prototype.flashAvailable = function() { if (typeof ActiveXObject !== "undefined" && ActiveXObject !== null) { return !!(new ActiveXObject('ShockwaveFlash.ShockwaveFlash')); From 678ae0686f201426d7b5bb5d3e54ef907c12e5f5 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 14 Sep 2013 00:42:13 -0400 Subject: [PATCH 3/6] upgrade ruby version for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f9d70f9..d7d6d73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,4 @@ script: "./script/cibuild" #environment language: ruby rvm: - - 1.9.3 \ No newline at end of file + - 2.0.0 From 08c0635e0a7024017ae4c9234dae6ae078ce4e4d Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 14 Sep 2013 02:15:12 -0400 Subject: [PATCH 4/6] include list of resources --- about.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/about.md b/about.md index cf5c142..93042b6 100644 --- a/about.md +++ b/about.md @@ -11,9 +11,14 @@ If you already know what you’re doing and have a license you prefer to use ## Not comprehensive -This site is not a comprehensive directory of open source licenses. If you’re looking for a comprehensive list, we recommend the Open Source Initiative website. +This site is not a comprehensive directory of open source licenses. We think there are too many options, which adds to the confusion. On the homepage, we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/). Additional resources: -We think there are too many options, which adds to the confusion. On the homepage, we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/). + ## Help us improve it From 5cb937aa9d255f05d1967f0352f5ec2fbcdc9d48 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 16 Sep 2013 14:06:50 -0400 Subject: [PATCH 5/6] use kramdown to process markdown --- _config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/_config.yml b/_config.yml index e69d1e7..5662322 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,6 @@ title: ChooseALicense.com relative_permalinks: false -markdown: redcarpet +markdown: kramdown rules: @@ -8,33 +8,33 @@ rules: include-copyright: description: Include a copy of the license and copyright notice with the code. label: License and copyright notice - document-changes: + document-changes: description: Indicate significant changes made to the code. label: State Changes disclose-source: description: Source code must be made available when distributing the software. In the case of LGPL, the source for the library (and not the entire program) must be made available. label: Disclose Source library-usage: - description: The library may be used within a non-open-source application. + description: The library may be used within a non-open-source application. label: Library usage - rename: + rename: description: You must change the name of the software if you modify it. label: Rename permitted: - commercial-use: + commercial-use: description: This software and derivatives may be used for commercial purposes. label: Commercial Use - modifications: + modifications: description: This software may be modified. label: Modification - distribution: + distribution: description: You may distribute this software. label: Distribution - sublicense: + sublicense: description: You may grant a sublicense to modify and distribute this software to third parties not included in the license. label: Sublicensing - private-use: + private-use: description: You may use and modify the software without distributing it. label: Private Use patent-grant: @@ -45,10 +45,10 @@ rules: trademark-use: description: While this may be implicitly true of all licenses, this license explicitly states that you may NOT use the names, logos, or trademarks of contributors. label: Use Trademark - no-liability: + no-liability: description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. label: Hold Liable - no-sublicense: + no-sublicense: description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. label: Sublicensing modifications: From 97a644642021b954dcba007d0f4641f4cb29653e Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Mon, 16 Sep 2013 14:21:19 -0400 Subject: [PATCH 6/6] convert resource list to kramdown syntax --- about.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/about.md b/about.md index 93042b6..f614b3b 100644 --- a/about.md +++ b/about.md @@ -13,12 +13,11 @@ If you already know what you’re doing and have a license you prefer to use This site is not a comprehensive directory of open source licenses. We think there are too many options, which adds to the confusion. On the homepage, we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/). Additional resources: - +* [Open Source Initiative](http://opensource.org/licenses/) - comprehensive list of open source licenses +* [Comparison of free and open-source software licenses](http://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on Wikipedia +* [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) from [OSS Watch](http://www.oss-watch.ac.uk/) +* [TLDRLegal](http://www.tldrlegal.com/) +{: .bullets} ## Help us improve it