1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-10 13:38:53 +01:00
Commit Graph

478 Commits

Author SHA1 Message Date
Julian Stirling
0d7c2d161f Update projects using CERN-OHL-S and CERN-OHL-P 2022-06-10 17:35:06 +01:00
Mike Linksvayer
8b99ed7734
Merge branch 'gh-pages' into gh-pages 2022-06-10 12:06:19 -04:00
Tyler887
9732e1e193
Merge branch 'gh-pages' into patch-5 2022-05-11 22:40:20 +01:00
Yishuai Li
5881f34b1e
mulan: fix wrapping and trim space 2022-04-14 19:36:12 -04:00
Tyler887
d376378ee6 Update gfdl-1.3.txt 2022-03-22 17:15:12 +00:00
Tyler887
326f9e74c4 Update gfdl-1.3.txt 2022-03-22 17:15:12 +00:00
Tyler887
b628ba0fbf Update gfdl-1.3.txt 2022-03-22 17:15:12 +00:00
Tyler887
9c8af70520 Update gfdl-1.3.txt 2022-03-22 17:15:12 +00:00
Tyler887
35b074b0ae Update gfdl-1.3.txt 2022-03-22 17:15:12 +00:00
Tyler887
3fca253802 Update _licenses/gfdl-1.3.txt
Co-authored-by: Mike Linksvayer <mlinksva@github.com>
2022-03-22 17:15:12 +00:00
Tyler887
d44930a777 Update gfdl-1.3.txt 2022-03-22 17:15:12 +00:00
Tyler887
835f8c1e99 Create gfdl-1.3.txt 2022-03-22 17:15:12 +00:00
Mike Linksvayer
639dac9dc5
Fix EUPL-1.1 guidance link 2022-03-16 16:08:34 -07:00
Tyler887
d91f364d2c
Update _licenses/mit.txt
Co-authored-by: Mike Linksvayer <mlinksva@github.com>
2022-03-16 22:38:38 +00:00
Tyler887
1a37894edb
.NET Core > .NET 2022-03-16 16:43:17 +00:00
Mike Linksvayer
93520454c6
Merge branch 'gh-pages' into patch-1 2022-03-15 09:13:43 -07:00
Mike Linksvayer
85703571e2
Merge branch 'gh-pages' into gh-pages 2022-01-22 14:14:48 -08:00
Mike Linksvayer
164971616d
Reflect 44691632d2 2022-01-22 13:49:06 -08:00
Tyler887
f1a7e33d19
Remove "all rights reserved" 2022-01-22 09:03:27 +00:00
Benno Bielmeier
0375fbda07
Fix misplaced blank line in cc-by-sa-4.0
In order to preserver consistency, the blank line should go after the
enumeration item, not within.
2021-11-30 13:38:30 +01:00
Mike Linksvayer
96017b3035
Update example use URL for UPL-1.0
File was renamed.
2021-10-26 12:53:24 -07:00
nytpu
8d4b35ef94 fix license wrapping 2021-08-24 09:55:11 -06:00
nytpu
22bc080c4f Add the CERN Open Hardware version 2 family of licenses 2021-08-23 17:08:49 -06:00
Waldir Pimenta
ed2c65d9f6
0BSD: update usage examples
Use one example with the title and copyright notice, one with just the latter, and one with neither.
2021-08-13 20:33:03 +01:00
Mike Linksvayer
b2ebfffd49
Add example use suggested at https://github.com/github/choosealicense.com/pull/603#issuecomment-895709400 2021-08-12 10:07:02 -07:00
Vaporox
ad8613ba28
Better consistency between MIT and derivatives 2021-08-09 12:35:45 -07:00
Waldir Pimenta
b84af5cd38 Restore title in text of 0BSD license (now present in SPDX)
This reverts commit bab9f14fa9.
2021-08-05 21:59:54 +01:00
Mike Linksvayer
2b9d5c2c60
Merge branch 'gh-pages' into enhancement/osl-afl-3.0-consistency 2021-07-05 21:35:42 -07:00
Mike Linksvayer
4037f7168e
Update BSD-3-Clause examples because d3 is now ISC licensed 2021-07-05 21:31:41 -07:00
William Swartzendruber
ca19f18cc5
Making the OSL-3.0 and AFL-3.0 text consistent with each other. 2021-07-05 18:59:21 -06:00
Mike Linksvayer
f807d03fae
Add Mulan PSL v2 as nickname for MulanPSL-2.0 2021-04-04 20:36:09 -07:00
TheInterestingSoul
49800f1b9b
Remove the duplicate line in MulanPSL-2.0
Forgive me for not wearing glasses.
2021-04-05 10:45:57 +08:00
TheInterestingSoul
3704417316
Correct writing in MulanPSL-2.0 2021-04-05 10:41:43 +08:00
TheInterestingSoul
071d0a76ab
Change the using example in MulanPSL-v2
Got one from Google search with `site:github.com` qualifier. (
2021-04-05 10:34:27 +08:00
TheInterestingSoul
f0efa379bb
Correct the writing format in MulanPSL-2.0 2021-04-05 10:23:29 +08:00
TheInterestingSoul
74170e098a
Update using example in MulanPSL-2.0
Huawei LiteOS is licensed under BSD-3-Clause, but the security function library, called `libsec`, is stored in a secondary directory.
2021-04-05 09:57:34 +08:00
TheInterestingSoul
3d952744bc
Fix missing comma in MulanPSL-2.0 2021-04-05 09:50:15 +08:00
TheInterestingSoul
86129dc939 Change the comma form for MulanPSL-v2 2021-04-04 15:32:23 +08:00
TheInterestingSoul
7aa8552234 Correct the for MulanPSL-v2 2021-04-04 15:18:06 +08:00
TheInterestingSoul
8ab1de2000 Correct the wrap lines for MulanPSL-v2 2021-04-04 15:13:09 +08:00
TheInterestingSoul
d8a0cbe843 Correct the wrap lines for MulanPSL-v2 2021-04-04 15:10:00 +08:00
TheInterestingSoul
7d0e120a22 Correct the YAML format for MulanPSL-v2 2021-04-04 14:53:30 +08:00
TheInterestingSoul
17dc9b40dd
Add the Mulan-PSL v2 license
1. SPDX Identifier: https://spdx.org/licenses/MulanPSL-2.0.html
2. OSI approved: https://opensource.org/licenses/MulanPSL-2.0
3. Over 1000 projects: https://hub.fastgit.org/search?q=%22Mulan+PSL+v2%22+filename%3ALICENSE
4. 3 notable projects founded

Chinese characters are wrapped to 50 characters each line width since they're much wider than English letters.

previous issue: #761
2021-04-04 12:08:09 +08:00
Mike Linksvayer
9a138e1ef3
Update CC-BY-4.0 example use
WHATWG moved to a concatenated CC-BY-4.0 and BSD-3-Clause LICENSE file
2021-03-29 09:25:41 -07:00
Mike Linksvayer
2324b41306
Update ODbL title
Caught by CI, following https://github.com/spdx/license-list-XML/pull/1181
2021-03-29 09:22:05 -07:00
Mike Linksvayer
55d5160d84
BSD-3-Clause description: copyright holder rather than project 2021-03-23 13:53:07 -07:00
Mike Linksvayer
e0797f324b align with a5e495914c 2021-02-26 12:45:13 -08:00
Mike Linksvayer
5c5ac6d8db
Merge branch 'gh-pages' into mit-0 2021-02-26 12:37:56 -08:00
Mike Linksvayer
f79f20a052
Update mit-0.txt
add examples
2021-02-26 12:37:14 -08:00
Benno Bielmeier
d4c21e14a7
Apply max line-width in eupl-1.2.txt 2020-12-22 09:58:34 +01:00
Benno Bielmeier
7a5b314c04
Update format of eupl-1.2.txt
Use the official UTF-8 format version from
https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/2020-03/EUPL-1.2%20EN.txt
that is linked on
https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
2020-12-22 09:29:42 +01:00
NotUnlikeTheWaves
524ed15f82
Update language count, add link for EUPL 1.2 2020-11-11 15:37:58 +01:00
Mike Linksvayer
0d43fb364d update using examples urls 2020-10-29 19:38:50 -07:00
viral32111
4e2d9d64b3
Add notable project scoop 2020-10-27 14:00:43 +00:00
viral32111
83f63facde
Remove notable project youtube-dl
The project received a DMCA takedown request so this can't serve as an example newcomers can follow.

I'm not sure of any other notable projects using this licence that could replace it, sorry.
2020-10-26 23:36:30 +00:00
ObserverOfTime
1ad3d204d5
Update npgsql license URL 2020-10-03 11:47:04 +03:00
ObserverOfTime
a5e495914c
Convert license using array to map 2020-10-03 11:34:50 +03:00
Mike Linksvayer
90657c60f5 defaults, examples 2020-09-13 15:53:22 -07:00
Mark Atwood
6fc9e6b8f2 add mit-0 license 2020-09-13 15:29:42 -07:00
Mike Linksvayer
aa5aedbe56
Merge branch 'gh-pages' into patch-1 2020-09-13 15:09:58 -07:00
Mike Linksvayer
804bfb71e9 Update UPL-1.0 example
Fixes broken link
2020-07-08 08:37:10 -07:00
Mike Linksvayer
12f42cabb9 add vim to hard to detect licenses pending https://github.com/licensee/licensee/pull/437
update NCSA exmaple
2020-06-21 15:53:25 -07:00
Mike Linksvayer
b72d00974d branch rename for 3 examples 2020-06-21 15:32:37 -07:00
Mike Linksvayer
3628e08299 Update example uses 2020-05-18 12:14:02 -07:00
Mike Linksvayer
4ac8fb30e2
update OSD iD LICENSE file location 2020-03-31 10:50:35 -07:00
Waldir Pimenta
d12ed9d1f8 Fix formatting of Creative Commons licenses 2020-03-31 18:39:09 +01:00
Waldir Pimenta
e8fd008979
ISC examples: replace helix with starship 2020-02-29 13:46:54 +00:00
othree
b509f7fa1f
Vim don't have limitation of liability:Wq 2020-01-23 14:47:04 +08:00
Mike Linksvayer
2926ce39ae
address failing tests 2020-01-21 12:26:46 -08:00
Mike Linksvayer
3ea95b5acc
yml syntax 2020-01-21 12:12:51 -08:00
othree
23754503dd
Add vim.txt 2020-01-21 23:42:46 +08:00
Waldir Pimenta
134657d43e Standardize structure of first sentence of usage instructions 2020-01-19 19:54:58 +00:00
Waldir Pimenta
fc2abb4b6f Reword usage note about recommended notices
The previous wording was a little awkward.
This commit changes it to be a little more explicit and hopefully clearer.
2020-01-18 11:49:19 +00:00
zisk
a374e4ba3a
Update link to .NET Core license file
It appears the .NET Core repos were consolidated at some point so the current link is no longer valid.
More info: https://github.com/dotnet/announcements/issues/119
2020-01-17 08:46:42 -05:00
Mike Linksvayer
4c002534af Show BSL-1.0 between MIT and Unlicense in license spectrum 2019-12-26 13:41:37 -08:00
Mike Linksvayer
f09f485e92
Merge pull request #709 from github/lgplv3complex
Amend [L]GPL-3.0 how to apply and "hide" LGPL-3.0 from PR initiator
2019-12-26 12:01:09 -08:00
Mike Linksvayer
ba48c3d877 rm unneeded trailing whitespace from various files 2019-12-25 10:58:01 -08:00
Mike Linksvayer
5419f535ce Amend [G]GPL-3.0 how to apply and "hide" LGPL-3.0 from PR initiator
as it requires multiple steps not supported by GitHub license picker,
should be carried out by people who know exactly what they're doing.
2019-12-24 13:51:15 -08:00
Mike Linksvayer
2bb6e2fc97
Merge branch 'gh-pages' into bsd-4-clause-tweaks 2019-11-23 14:40:20 -08:00
Mike Linksvayer
2ceafa9b13
BSD-4-Clause tweaks
Following up on #669 

- hidden is not needed as it is the default
- shorten description, don't refer to "4th clause" as the advertising clause is actually the 3rd clause
2019-11-23 14:34:23 -08:00
Mike Linksvayer
dee309c3b5
Merge branch 'gh-pages' into cc0-source-text 2019-11-23 14:28:11 -08:00
Mike Linksvayer
c6c26b797f
Master branch for example so if use case changes tests will detect 2019-11-23 14:24:42 -08:00
Alistair Francis
ffb3a73623 Add the BSD-4-Clause license
This adds the BSD-4-clause license type.

1. SPDX Identifier: https://spdx.org/licenses/BSD-4-Clause.html
2. GNU's list of free licenses: https://www.gnu.org/licenses/license-list.en.html#OriginalBSD and FSF approved
3. Over 1000 projects: https://github.com/search?q=BSD+4-Clause+filename%3ALICENSE&type=Code
4. Yosemite Blockchain, pwolfgang/querybuilder and PMSPAUR-public use the BSD-4-clause license

This is based on the previous work of: https://github.com/github/choosealicense.com/pull/511

Signed-off-by: Alistair Francis <alistair@alistair23.me>
2019-11-23 13:56:52 -08:00
Mike Linksvayer
379bf41d44 fix yaml, test 2019-11-20 08:11:57 -08:00
Mike Linksvayer
44c8b266ac
unhide cc0 2019-11-20 08:06:37 -08:00
Mike Linksvayer
7a93042df8
Merge branch 'gh-pages' into bin-no-by 2019-11-19 15:48:46 -08:00
Mike Linksvayer
3766d508c4
Merge branch 'gh-pages' into cc0-source-text 2019-11-19 15:45:51 -08:00
Waldir Pimenta
3aec270042 Add examples for Creative Commons licenses and OFL
Also adjust instructions in README.md to match CONTRIBUTING.md
2019-11-19 23:13:41 +00:00
Mike Linksvayer
32195a084f
Merge branch 'gh-pages' into cc0-source-text 2019-11-19 10:39:06 -08:00
Mike Linksvayer
08ec1de724 Add BSL-1.0 and Zlib examples 2019-11-18 10:32:39 -08:00
Mike Linksvayer
4e62d749b0 Add include-copyright--source condition to more precisely describe bsl-1.0 and zlib 2019-11-18 10:21:22 -08:00
Mike Linksvayer
ab4c8ba384 Add nickname for BSD-3-Clause-Clear
Used in https://github.com/licensee/licensee/pull/391
2019-10-25 11:43:26 -07:00
Anne van Kesteren
47a7d95c20
HTTPS is great 2019-09-25 15:36:34 +02:00
Mike Linksvayer
83b6d75751
sort examples 2019-08-26 12:25:23 -07:00
Mike Linksvayer
bdd11363cc
rewrite description 2019-08-26 12:24:35 -07:00
Mike Linksvayer
231cc3167f swap out example provided at https://github.com/github/choosealicense.com/pull/527#issuecomment-524334219 2019-08-26 11:27:05 -07:00
Mike Linksvayer
eca2abe5e9
Merge branch 'gh-pages' into patch-1 2019-08-17 16:02:40 -07:00
Mike Linksvayer
e089c7f842
Merge branch 'gh-pages' into patch-1 2019-07-05 10:07:43 -07:00
Mike Linksvayer
a03c1068c8
Swap out no longer detectable UPL-1.0 example 2019-06-27 20:36:45 -07:00
Mike Linksvayer
00f09537ea Consistent formatting of AFL-3.0 and OSL-3.0 2019-06-20 12:48:21 -07:00