docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00
Code Issues Releases Wiki Activity
886 Commits 3 Branches 0 Tags 5.1 MiB
Commit Graph

886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Linksvayer
ab3ee0061b take projects listed on homepage from license using property 2016-03-02 18:23:31 -08:00
Mike Linksvayer
9ec2de1a50 rm gplv2 from homepage 
- remove descrption of v2 v3 difference
- add to description v3 express patent grant
- update example projects to only include v3 ones
- move v2 projects to gplv2 license using property

partially addresses feedback in #335
 2016-03-02 10:19:33 -08:00
Mike Linksvayer
7b2790bf14 Merge pull request #360 from github/express-non-patent-grant 
Express non patent grant
 2016-02-29 20:44:38 -08:00
Mike Linksvayer
78217a096b Use Trademark -> Trademark Use to match otther Use Xs 2016-02-28 12:15:51 -08:00
Mike Linksvayer
2c063f2a94 sync README.md with _data/rules.yml, remove non-open forbiddens 
should have been removed as part of
https://github.com/github/choosealicense.com/pull/345
correct that oversight
 2016-02-28 12:12:57 -08:00
Mike Linksvayer
ede7a09118 Add "forbidden" property for "patent-use", mirroring "trademark-use", 
for the sorry licenses that explicitly do not grant any patent
permissions
 2016-02-28 12:10:23 -08:00
Mike Linksvayer
29538e1dcf Merge pull request #359 from github/food-licenses 
non-software licenses page
 2016-02-28 08:43:09 -08:00
Mike Linksvayer
7acfa511b1 Merge pull request #358 from thewarpaint/add-project-links 
Add project links
 2016-02-27 11:10:09 -08:00
Eduardo Garcia
779e19fb3b Add project links 2016-02-26 16:52:25 -06:00
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
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 48c6e3e88785106d0a9357df8385f11891e85565.
 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