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

895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Linksvayer
a8e1258a6c Merge pull request #363 from wking/cc-not-software-fragment-typo 
non-software: Remove period from "not CC for software" fragment
 2016-03-06 21:31:03 -08:00
W. Trevor King
8f161c8e52 non-software: Remove period from "not CC for software" fragment 
The trailing period has been there since the link landed in 2d4c4a63
(non-software licenses page, 2016-02-26, #359).
 2016-03-06 13:52:42 -08:00
Mike Linksvayer
a00903196b Merge pull request #362 from github/gplv3-home 
rm gplv2 from homepage
 2016-03-06 09:33:05 -08:00
Mike Linksvayer
1e7e054a26 Merge remote-tracking branch 'origin/gh-pages' into gplv3-home 2016-03-05 10:08:16 -08:00
Mike Linksvayer
25f09e4a6d Merge pull request #361 from github/p-c-l 
rename/order license properties better reflect how licenses work
 2016-03-05 09:56:48 -08:00
Mike Linksvayer
9a56c327d7 opportunistic https to kick CI 2016-03-02 18:27:44 -08:00
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
aca74d3aa3 another https opportunistic to kick CI 
https://travis-ci.org/github/choosealicense.com/builds/112981705
 2016-03-01 14:43:23 -08:00
Mike Linksvayer
e500227ce0 change some links to https 
CI failed on a bunch of links, spurious, this just opportunisitc
to also kick CI
 2016-03-01 14:14:11 -08:00
Mike Linksvayer
810eeb5618 rename/order license properties better reflect how licenses work 
and are structured

grant (permissions)
conditioned on (conditions)
with limitations

Permissions coming first combats mistaken but apparently widespread
impression that licenses impose conditions, even such that without
a license, there would be no conditions/work would be in the public
domain.

Requirements->Conditions emphasizes that they are pertinent if one
wants to take advantage of permissions.

Forbiddens->Limitations is more accurate: in most cases licenses
don't give permission to hold licensors liable, in some cases to
use licensors' trademarks or patents, but a licensee does not lose
the permissions granted by the license if the licensee holds licensor
liable, etc. Also emphasizes that there are limitatations on the
license grant, not that the license imposes prohibitions.

The most concise place to see both the rename and reorder is in
_includes/license-overview.html

I did not reorder the appearance of the groups of properties in
license source files (.txt files in _licenses) as those orderings
are not used to render anything on the webiste. Might do so later.
 2016-03-01 13:33:15 -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