docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-11-09 21:18:53 +01:00
Code Issues Releases Wiki Activity
1,230 Commits 2 Branches 0 Tags 5.1 MiB
d43130dc55
Commit Graph

1230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Linksvayer
c46511d314 Attempt to address line comments from @benbalter 2016-02-26 14:44:57 -08:00
Mike Linksvayer
2d4c4a63bd non-software licenses page 
building on https://github.com/github/choosealicense.com/pull/307

non-software rather than non-code because software is eating the
world, the main topic is open source software, and I find
software/non-software slighly less trying than code/non-code if
only because it isn't a
[thing](http://www.adamhyde.net/perhaps-stop-using-non-code-whatayarekin/).

tweak text of page, also addressing #261 and #313
 2016-02-26 12:34:20 -08:00
Mike Linksvayer
6df14f2d42 Merge branch 'content-B' of https://github.com/afeld/choosealicense.com into food-licenses 2016-02-25 18:18:41 -08:00
Mike Linksvayer
ffc84c2b41 Merge pull request #357 from wking/cc-fixups 
cc-by-sa-4.0: Fix CC BY link and add compatible license mention
 2016-02-24 14:33:14 -08:00
W. Trevor King
39154843df cc-by-sa-4.0: Weaken "same license" to mention compatibility 
The human-readable summary uses "same license" [1], but also links to
a page listing other compatible licenses [2], and the license text
includes a compatible-license alternative [3,4].  This commit links to
that same set of compatible licenses using Mike's wording [5].

[1]: https://creativecommons.org/licenses/by-sa/4.0/
[2]: https://creativecommons.org/compatiblelicenses/
[3]: https://creativecommons.org/licenses/by-sa/4.0/legalcode#s3b1
[4]: https://creativecommons.org/licenses/by-sa/4.0/legalcode#s1c
[5]: https://github.com/github/choosealicense.com/pull/353/files#r53963602
 2016-02-24 14:18:35 -08:00
W. Trevor King
a97a5bde53 cc-by-sa-4.0: Fix link to CC BY 4.0 (was self-reference) 
Correct a typo from c81c90ba (conform to SPDX title to make tests
work, #353).
 2016-02-24 14:07:49 -08:00
Mike Linksvayer
7e64d9e15b license title not cover copy button when long title, wide screen 
ex: http://choosealicense.com/licenses/cc-by-sa-4.0/

do it by setting max-width of heading to 700px, same as license
text display
 2016-02-23 17:47:34 -08:00
Mike Linksvayer
814bf9ac58 Merge pull request #353 from github/cc 
Add qualifying CC licenses
 2016-02-23 17:14:45 -08:00
Mike Linksvayer
e74a129d77 Merge pull request #354 from waldyrious/patch-1 
remove spaces at EOL per discussion in #351
 2016-02-21 16:14:41 -08:00
Waldir Pimenta
926ead535e remove spaces at EOL per discussion in #351 2016-02-21 22:10:43 +00:00
Mike Linksvayer
8e3f62f1e0 cleanup desc/how 2016-02-21 09:36:10 -08:00
Mike Linksvayer
c81c90baa1 conform to SPDX title to make tests work 2016-02-21 09:21:23 -08:00
Mike Linksvayer
3d1334c478 replace failing linka for abantecart 2016-02-20 09:27:21 -08:00
Mike Linksvayer
0cd6cc35d4 correct order of link text and link 2016-02-20 09:24:36 -08:00
Mike Linksvayer
f8578bc1a4 Add Code of Conduct 
Project doesn't have one, seems like an oversight. Copied
http://contributor-covenant.org/version/1/4/code_of_conduct.txt
 2016-02-20 08:46:11 -08:00
Mike Linksvayer
3d62a36258 Merge pull request #351 from github/artistic-patent-fmt 
recover indentation from source URL, note patent permission
 2016-02-19 09:10:47 -08:00
Mike Linksvayer
8e720907da recover indentation from source URL, note patent permission 2016-02-18 20:21:16 -08:00
Mike Linksvayer
d15cd819f4 Merge pull request #350 from github/bsd-nicknames 
Make BSD nicknames self-descriptive and conform to OSI site use
 2016-02-18 09:50:28 -08:00
Mike Linksvayer
6e36568139 Make BSD nicknames self-descriptive and conform to OSI site use 
- don't require knowledge of 'new' or 'simplified' relative to *what*
- rm nickname for BSD 3-clause Clear License which is hidden and
  deserves to remain little known
 2016-02-18 08:05:17 -08:00
Mike Linksvayer
b9c3705cba Merge pull request #349 from github/apache-version-gnu 
apache version, GNU *gpl naming
 2016-02-17 16:13:24 -08:00
Mike Linksvayer
0375c35382 *gpl nicknames reflect GNU usage 2016-02-17 15:19:24 -08:00
Mike Linksvayer
db18b5dfe6 apache version, GNU *gpl naming, in part via #335 2016-02-16 09:29:18 -08:00
Mike Linksvayer
d5828d5318 Merge pull request #348 from github/tab-slug-bye 
Remove need for tab-slug
 2016-02-13 18:15:34 -08:00
Mike Linksvayer
1b39c98fe4 use slugify per @benbalter suggestion 2016-02-13 17:57:44 -08:00
Ben Balter
9aae9cad12 a few minor markdown formatting fixes 2016-02-13 15:23:17 -05:00
Mike Linksvayer
056bdf0580 fix style found by rubocop 2016-02-12 16:00:12 -08:00
Mike Linksvayer
c04ea11e17 Remove need for tab-slug 2016-02-12 15:51:44 -08:00
Mike Linksvayer
ceed00b1a4 Merge pull request #347 from github/jekyll-3-0-3 
Revert temporary Jekyll 3.0.2 bug workarounds
 2016-02-09 09:46:31 -08:00
Ben Balter
6e387f4ecd update html proofer 2016-02-09 12:38:00 -05:00
Ben Balter
67d1e8feaa try using the jekyllrb version hack 2016-02-09 12:33:29 -05:00
Ben Balter
2fb71d284a Merge branch 'gh-pages' into jekyll-3-0-3 2016-02-09 12:26:24 -05:00
Ben Balter
8d71e4e00f Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into gh-pages 2016-02-09 12:23:50 -05:00
Ben Balter
91e79d2de9 update script/server for jekyll 3 2016-02-09 12:23:45 -05:00
Ben Balter
8d24208088 Revert "upgrade to jekyll 3 due to" 
This reverts commit 48c6e3e887.
 2016-02-09 12:21:11 -05:00
Ben Balter
9e83d6afe5 💎 bump 2016-02-09 12:18:05 -05:00
Mike Linksvayer
e7f20659dd Merge pull request #345 from github/open-licenses-test 
Test that only open licenses are included per CONTRIBUTING
 2016-02-09 09:06:51 -08:00
Ben Balter
cadadec677 Merge pull request #346 from github/rubocop 
Add Rubocop
 2016-02-09 10:49:28 -05:00
Ben Balter
a35be723a3 exclude vendor directory 2016-02-09 10:44:19 -05:00
Mike Linksvayer
14896c3fc8 style feedback from @benbalter 2016-02-08 14:02:07 -08:00
Ben Balter
91b6c8728e add rubocop 2016-02-08 15:37:19 -05:00
Mike Linksvayer
ade0beec17 Test that only open licenses are included per 
https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-a-license

- check that all licenses have minimum permissions
- remove non-open (and unused) forbiddens
- closes #1 with confidence
 2016-02-08 10:25:06 -08:00
Mike Linksvayer
659c2a0d47 Merge pull request #344 from github/copyleft-tweaks 
Copyleft tweaks
 2016-02-07 11:19:19 -08:00
Mike Linksvayer
2a01884f6f make same-license requirement, add to all copyleft licenses 2016-02-05 10:25:19 -08:00
Mike Linksvayer
5fb1cde719 remove note about LGPL and OSL, see discussion in #343 2016-02-05 09:15:05 -08:00
Mike Linksvayer
b07babb5fc Merge pull request #343 from wking/library-use-permitted 
Remove 'library-usage'
 2016-02-04 12:25:15 -08:00
W. Trevor King
92b2fa9728 Remove 'library-usage' 
The last meaningful change to this tag was c4c48d49 (Change nonstatic
to library usage, 2013-07-10), but I'm not sure where that discussion
happened.  In any case, that commit changed some "must" wording to
"may" wording, which seems like it should move the label from required
to permitted.  However, a library-usage permission would also apply to
many other licenses (e.g. folks are free to link MIT-licensed work
from a proprietary program), and adding library-usage to almost all
the licenses seems like the wrong way to make this distinction [1].

The limitations that the LGPL and OSL place on disclose-source scoping
are already covered in the disclose-source description, so the
library-usage label doesn't seem to be adding anything meaningful.
The OSL gets at this distinction by tightly scoping derivative works
[2], and the LGPL talks about combined works as a special subset of
derivative works [3,4].  The MPL makes a similar distinction between
"Covered Software" and "Larger Work" [5], and the EPL makes a similar
distinction between "derivative works" and "the Program" [6].  Whether
the location of those distinctions, or the requirements placed on
combined works can be neatly summarized in a boolean label remains to
be seen, but we're pretty sure that library-usage is not that label
[7].

Subsequent commits may replace the caveat in the disclose-source
description with wording in the license description themselves or by
adding a new label that summarizes the issue.  Until then, the
disclose-source description more clearly covers the information that
library-usage was intended to convey, so this commit removes the
less-clear label to avoid redundancy.

[1]: https://github.com/github/choosealicense.com/pull/343#issuecomment-179532710
[2]: http://rosenlaw.com/OSL3.0-explained.htm#_Toc187293087
[3]: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
[4]: https://www.gnu.org/licenses/lgpl.html
[5]: https://www.mozilla.org/en-US/MPL/2.0/
[6]: http://www.eclipse.org/legal/epl-v10.html
[7]: https://github.com/github/choosealicense.com/pull/343#issuecomment-179557468
 2016-02-04 11:38:05 -08:00
Mike Linksvayer
c58e248d9d Merge pull request #342 from github/jekyll3-tests-cleanup 
Fix #341 tests that broke post Jekyll 3 upgrade
 2016-02-03 10:08:16 -08:00
Mike Linksvayer
09a17298ab Fix #341 tests that broke post Jekyll 3 upgrade 
- explicitly include jekyll-coffeescript needed per
  http://jekyllrb.com/docs/upgrading/2-to-3/
- option to html-proofer to ignore script embeds; uncertain why
  warnings appeared post upgrade as it doesn't seem that either
  jekyll-seo-tag or html-proofer got new versions in
  https://github.com/github/choosealicense.com/pull/339/files but
  suppressed now in any case.
 2016-02-03 09:24:05 -08:00
Mike Linksvayer
a058281e66 Merge pull request #340 from github/revert-338-revert-337-update-fields-descriptions 
Revert "Revert "Update descriptions of fields to reflect hidden default change""
 2016-02-02 16:11:26 -08:00
Mike Linksvayer
5c020b61eb Revert "Revert "Update descriptions of fields to reflect hidden default change"" 2016-02-02 16:10:39 -08:00