1
0
mirror of https://github.com/github/choosealicense.com synced 2024-07-03 17:09:12 +02:00
Commit Graph

1234 Commits

Author SHA1 Message Date
Mike Linksvayer
f5848e10b7 Merge pull request #452 from joto/gh-pages
Add Boost Software License 1.0.
2016-09-17 08:04:11 -07:00
Mike Linksvayer
8de49ac800 alignment with other records
* same-license is not a limitation and doesn't apply in any way to BSL-1.0
* other licenses with a per-file notice recommendation get that added to the note field
* have the description mention the reason for this license existing, binary distribution without notices (IIUC)
* remove using: pending an example that can be followed by others and detected eg on GitHub, see https://github.com/github/choosealicense.com/blob/gh-pages/README.md#optional-fields and see #358 #372 #377
2016-09-16 15:40:36 -07:00
Mike Linksvayer
8c7ee28d6c remove | sort from for loops, avoid new(?) liquid warning 2016-09-16 14:59:55 -07:00
Jochen Topf
6a74345a6d Add Boost Software License 1.0. 2016-09-16 10:12:43 +02:00
Mike Linksvayer
ac276cf6c0 Merge pull request #451 from github/lgpl-3.0-how
Remove variation in instructions for applying LGPLv3
2016-09-15 09:16:09 -07:00
Mike Linksvayer
e800e1c845 Remove variation in instructions for applying LGPLv3
Leaving only the option described in https://www.gnu.org/licenses/gpl-howto.html

Following from discussion at https://github.com/benbalter/licensee/pull/113#r78846987
2016-09-14 14:45:04 -07:00
Mike Linksvayer
cdb980431e Merge pull request #450 from github/no-license-update
Update no-license
2016-09-10 10:53:20 -07:00
Mike Linksvayer
c008a5fbef CCIL broke John Cowan's website 2016-09-09 16:08:17 -07:00
Mike Linksvayer
0cee43e3c5 Update no-license
- qualify "no [actions]" with "without being at risk..."
- mention exceptions and limitations, jurisdiction-specific
- mention that collaborators don't give you permission, either
- remove trivial example copyright notice, suggest adding statement symmetric with for-users section below
- suggest exploring contributor agreement so non-licensor has permission from contributors

closes #444 #445
2016-09-09 15:20:11 -07:00
Mike Linksvayer
3b83bf4bdf Merge pull request #448 from waldyrious/patch-1
unlicense: fix typo "kakokune" -->"kakoune"
2016-08-22 12:19:50 -07:00
Waldir Pimenta
e0b2b9294d unlicense: fix typo "kakokune" -->"kakoune" 2016-08-22 20:03:52 +01:00
Mike Linksvayer
b0af73c0df Merge pull request #447 from waldyrious/patch-2
sort license properties as permissions > conditions > limitations (fixes #387)
2016-08-22 11:55:24 -07:00
Waldir Pimenta
9e6528c68f sort license properties in the order permissions > conditions > limitations (fixes #387) 2016-08-22 19:42:42 +01:00
Mike Linksvayer
4bebeef5c4 Merge pull request #446 from waldyrious/patch-1
unlicense: add 3 popular projects using it
2016-08-22 10:28:58 -07:00
Waldir Pimenta
e81e63e696 unlicense: add 3 popular projects using it 2016-08-22 18:24:02 +01:00
Mike Linksvayer
8db30c3582 Merge pull request #443 from jgovea25/patch-1
Add note about CLA
2016-08-08 12:24:04 -07:00
Joey Govea
c0fe6e3ded Add note about CLA 2016-08-08 11:34:51 -07:00
Mike Linksvayer
2b493be5fe Merge pull request #442 from sdgluck/patch-1
Fix source URL for ms-rl license
2016-07-24 08:58:57 -06:00
Sam Gluck
f44e11237b Fix source URL for ms-rl license 2016-07-24 09:47:39 +01:00
Mike Linksvayer
28c245adec small wording fix, see https://github.com/github/choosealicense.com/pull/440#issuecomment-230809370 2016-07-06 11:20:27 -07:00
Mike Linksvayer
22aeedd848 Merge pull request #440 from waldyrious/patch-1
Fix instructions for Artistic 2.0 (follow-up #333)
2016-07-06 08:03:26 -07:00
Waldir Pimenta
cfa7104f85 Fix instructions for Artistic 2.0 (follow-up #333)
cf. #103, #310 and #333
cc @mlinksva, @benbalter, @bkeepers and @Haacked
2016-07-06 15:02:20 +01:00
Mike Linksvayer
67677fe12b Merge branch 'pchaigno-zlib' into gh-pages 2016-07-01 12:52:24 -07:00
Mike Linksvayer
b2323bafa6 Merge branch 'zlib' of https://github.com/pchaigno/choosealicense.com into pchaigno-zlib 2016-07-01 12:51:57 -07:00
Paul Chaignon
28f55954bf zlib license 2016-07-01 20:52:01 +02:00
Mike Linksvayer
7e7944e987 Merge pull request #439 from github/using-LICENSE
Update docs: `using:` field value should be a link to LICENSE implementation
2016-06-30 16:28:30 -07:00
Mike Linksvayer
582d2029a0 let's be consistent with _ in "variables" 2016-06-30 09:57:40 -07:00
Mike Linksvayer
1b983bd1e4 rm unneeded quotes 2016-06-30 09:56:15 -07:00
Mike Linksvayer
675309ad24 make explicit in docs what I was about to leave as pull request desc 2016-06-30 09:47:28 -07:00
Mike Linksvayer
69095b6f93 Update docs: using: field value should be a link to LICENSE implementation
Practice since #358 see #372 and #377 for examples.
2016-06-30 09:36:56 -07:00
Mike Linksvayer
c2d70ffc34 Merge pull request #436 from EmilGedda/patch-1
Correct the spelling of "license" in wtfpl
2016-06-15 13:42:30 -07:00
Emil Gedda
bed6d31cc7 Correct the spelling of "license" in wtfpl
Just a minor correction i found while browsing.
2016-06-15 21:44:52 +02:00
Mike Linksvayer
d932c9f9a0 Merge pull request #435 from github/hidden-false-licenses
re-add optional hidden field, default to true
2016-06-14 11:19:54 -07:00
Mike Linksvayer
cf79b35e06 re-add optional hidden field, default to true
licenses on /licenses have `hidden: false` set

fixes #434
2016-06-14 10:35:44 -07:00
Mike Linksvayer
c8de57aba7 Merge pull request #432 from saraford/gh-pages
Updated footer to link to GitHub repo for ChooseALicense
2016-06-13 11:23:55 -07:00
Sara Ford
22212ae035 Updated footer to link to GitHub repo for ChooseALicense 2016-06-13 10:57:40 -07:00
Mike Linksvayer
dcc34638af Merge pull request #430 from github/license-years-contributors
update year, add contributors
2016-06-10 09:25:08 -07:00
Mike Linksvayer
a3f0f81919 update year, add contributors 2016-06-09 16:24:32 -07:00
Mike Linksvayer
64f0fc9b02 Merge pull request #428 from github/small-link-appendix
small link to appendix & improve for linking, guiding back to home page
2016-06-07 08:10:39 -07:00
Mike Linksvayer
827d62cc28 vertical spacing 2016-06-06 10:25:18 -07:00
Mike Linksvayer
83c39a345d small link to appendix & improve for linking, guiding back to home page
Based on feeedback from people looking for BSD licenses and wanting to
use site as a reference.

I'm not thrilled with any distraction from flow of choices that
work for most on home page through spectrum covering range of open
source licenses without redundant ones, but obviously some people
prefer seeing everything in a table, so let them find it, accommodate
use as reference and people whose learning style involes poring
over a reference rather than being guided.
2016-06-06 10:15:22 -07:00
Mike Linksvayer
2e2185549c Merge pull request #426 from github/highlight-target-id
highlight target id to make link#id behavior more apparent
2016-06-05 10:03:36 -07:00
Mike Linksvayer
f37bad97ec highlight target id to make link#id behavior more apparent
suggested by @LeoFNaN at
https://github.com/github/choosealicense.com/pull/411#issuecomment-223729386
2016-06-04 15:27:47 -07:00
Mike Linksvayer
7cefe4c92d rm unncessary 'additionally' 2016-06-03 10:25:30 -07:00
Mike Linksvayer
202c715b79 Merge pull request #396 from github/functional-descriptions
Rework descriptions of 7 listed on /licenses
2016-06-03 10:23:53 -07:00
Mike Linksvayer
b527e10318 Merge branch 'gh-pages' into functional-descriptions 2016-06-03 10:11:17 -07:00
Mike Linksvayer
6d8339765e remove somewhat redundant words 2016-06-03 10:10:08 -07:00
Mike Linksvayer
3b8047917e Merge pull request #421 from github/package-metadata
License identifiers and package descriptions hint
2016-06-02 13:55:17 -07:00
Mike Linksvayer
f09d10922f reword, emphasize optional 2016-06-02 12:17:20 -07:00
Mike Linksvayer
2e7b84b816 reword: note optional, mention effect; make slightly less prominent 2016-06-02 11:57:32 -07:00