1
0
mirror of https://github.com/github/choosealicense.com synced 2025-01-03 10:31:44 +01:00

Merge remote-tracking branch 'origin/gh-pages' into resources

This commit is contained in:
Aidan Feldman 2013-09-16 14:12:24 -04:00
commit 972ae57106
6 changed files with 17 additions and 16 deletions

1
.ruby-version Normal file
View File

@ -0,0 +1 @@
2.0.0

View File

@ -5,4 +5,4 @@ script: "./script/cibuild"
#environment #environment
language: ruby language: ruby
rvm: rvm:
- 1.9.3 - 2.0.0

View File

@ -1,3 +1,4 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby File.read('.ruby-version').strip
gem "github-pages" gem "github-pages"

View File

@ -9,7 +9,7 @@ GEM
highline (~> 1.6.11) highline (~> 1.6.11)
directory_watcher (1.4.1) directory_watcher (1.4.1)
fast-stemmer (1.0.2) fast-stemmer (1.0.2)
github-pages (1) github-pages (4)
RedCloth (= 4.2.9) RedCloth (= 4.2.9)
jekyll (= 1.1.2) jekyll (= 1.1.2)
kramdown (= 1.0.2) kramdown (= 1.0.2)

View File

@ -1,6 +1,6 @@
title: ChooseALicense.com title: ChooseALicense.com
relative_permalinks: false relative_permalinks: false
markdown: redcarpet markdown: kramdown
rules: rules:
@ -8,33 +8,33 @@ rules:
include-copyright: include-copyright:
description: Include a copy of the license and copyright notice with the code. description: Include a copy of the license and copyright notice with the code.
label: License and copyright notice label: License and copyright notice
document-changes: document-changes:
description: Indicate significant changes made to the code. description: Indicate significant changes made to the code.
label: State Changes label: State Changes
disclose-source: 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. 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 label: Disclose Source
library-usage: 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 label: Library usage
rename: rename:
description: You must change the name of the software if you modify it. description: You must change the name of the software if you modify it.
label: Rename label: Rename
permitted: permitted:
commercial-use: commercial-use:
description: This software and derivatives may be used for commercial purposes. description: This software and derivatives may be used for commercial purposes.
label: Commercial Use label: Commercial Use
modifications: modifications:
description: This software may be modified. description: This software may be modified.
label: Modification label: Modification
distribution: distribution:
description: You may distribute this software. description: You may distribute this software.
label: Distribution label: Distribution
sublicense: sublicense:
description: You may grant a sublicense to modify and distribute this software to third parties not included in the license. description: You may grant a sublicense to modify and distribute this software to third parties not included in the license.
label: Sublicensing label: Sublicensing
private-use: private-use:
description: You may use and modify the software without distributing it. description: You may use and modify the software without distributing it.
label: Private Use label: Private Use
patent-grant: patent-grant:
@ -45,10 +45,10 @@ rules:
trademark-use: 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. 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 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. description: Software is provided without warranty and the software author/license owner cannot be held liable for damages.
label: Hold Liable 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. description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license.
label: Sublicensing label: Sublicensing
modifications: modifications:

View File

@ -1,9 +1,8 @@
// Generated by CoffeeScript 1.4.0 // Generated by CoffeeScript 1.6.3
(function() { (function() {
var Choosealicense; var Choosealicense;
Choosealicense = (function() { Choosealicense = (function() {
Choosealicense.prototype.flashAvailable = function() { Choosealicense.prototype.flashAvailable = function() {
if (typeof ActiveXObject !== "undefined" && ActiveXObject !== null) { if (typeof ActiveXObject !== "undefined" && ActiveXObject !== null) {
return !!(new ActiveXObject('ShockwaveFlash.ShockwaveFlash')); return !!(new ActiveXObject('ShockwaveFlash.ShockwaveFlash'));