1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 21:00:10 +01:00

1685 Commits

Author SHA1 Message Date
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
388481d75e
Merge pull request #817 from github/submodules
CI: checkout submodules
2021-03-29 09:33:34 -07:00
Mike Linksvayer
af860ab642
rubocop: indent 2021-03-29 09:32:31 -07:00
Mike Linksvayer
07e3e9521f
rubocop fixes 2021-03-29 09:30:10 -07: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
a4d6143706
CI: checkout submodules 2021-03-29 09:17:44 -07:00
Mike Linksvayer
033535bd6b
Merge pull request #815 from github/bsd-3-clause-description
BSD-3-Clause description: copyright holder rather than project
2021-03-23 14:02:17 -07:00
Mike Linksvayer
55d5160d84
BSD-3-Clause description: copyright holder rather than project 2021-03-23 13:53:07 -07:00
Mike Linksvayer
5d2587c4b3
Merge pull request #770 from github/mit-0
Add MIT No Attribution
2021-02-27 13:10:08 -08:00
Mike Linksvayer
d4f8e2afe1 license-list-XML as submodule and further monkeypatch licensee to use it 2021-02-26 13:47:53 -08:00
Mike Linksvayer
e0797f324b align with a5e495914c0df227e0ecd641852788c54586a04c 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
Mike Linksvayer
169e68e33a
Merge pull request #806 from PawelBorkar/update-license
Update license year to 2021
2021-02-26 12:33:20 -08:00
Pawel Borkar
6b58f5f292 Update license year to 2021 2021-02-20 22:58:14 +05:30
Mike Linksvayer
46655bcb01
Merge pull request #797 from bbenno/patch-1
Update format of eupl-1.2.txt
2020-12-22 17:31:14 +00: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
Mike Linksvayer
cefff1287e
Merge pull request #796 from github/ofl-rfn
-no-RFN and -RFN to OFL sidebar
2020-12-18 05:24:32 +00:00
Mike Linksvayer
af6ee9e35c no longer used 2020-12-17 21:13:52 -08:00
Mike Linksvayer
8b401895a1 -no-RFN and -RFN to OFL sidebar
Fixes #795
2020-12-13 10:45:01 -08:00
Mike Linksvayer
855b61ca4a
Merge pull request #791 from github/bundler-cache
turn on bundler cache
2020-11-20 10:04:55 -08:00
Nick Schonning
df2920d76f redundant with cache enabled, per https://github.com/github/choosealicense.com/pull/791#discussion_r527852495 2020-11-20 10:00:29 -08:00
Mike Linksvayer
f7bd8a4d26 don't publish spec directory 2020-11-20 09:42:45 -08:00
Mike Linksvayer
41ae853189 turn on bundler cache 2020-11-20 09:20:59 -08:00
Mike Linksvayer
50e1c11054
Merge pull request #784 from waldyrious/capitalization-punctuation
Capitalization, punctuation and spelling fixes
2020-11-14 14:50:05 -08:00
Mike Linksvayer
562cf6b629
Merge branch 'gh-pages' into capitalization-punctuation 2020-11-14 14:45:42 -08:00
Mike Linksvayer
6fca4fe74b
Merge pull request #790 from github/fonts-comprehension
Improve Language Comprehension
2020-11-14 14:44:40 -08:00
Mike Linksvayer
aedef9e369 Partially revert "Harmonize quotation marks and apostrophes"
Partially reverts commit 3e2b69c68a155c462658c2d28a90a2f00a4e6f5d.
2020-11-14 14:43:23 -08:00
Mike Linksvayer
ea3eed3c6a
Merge branch 'gh-pages' into fonts-comprehension 2020-11-14 14:32:01 -08:00
Mike Linksvayer
d7f09a1d38
Merge pull request #789 from NotUnlikeTheWaves/patch-1
Update language count, add link for EUPL 1.2
2020-11-11 10:17:46 -08:00
NotUnlikeTheWaves
524ed15f82
Update language count, add link for EUPL 1.2 2020-11-11 15:37:58 +01:00
Waldir Pimenta
b15ba984a9 more direct way to join the two clauses 2020-11-03 10:45:15 -08:00
Apollo-Apostolos
374541eebd
Improve Language Comprehension
These changes help non-English speakers to read along.

Changing "but" to "and" suggests a correct continual pathos whilst adding clarity.
"But" is used to suggest a hard shift in mindset. It was misused.

Changing "them" to "those" clarified that the sentence is about fonts and not about people setting the license.
"Them" is used as shorthand for humans. It will confuse the reader.
2020-11-01 16:07:20 +00:00
Mike Linksvayer
d84be5cf19
Merge pull request #786 from viral32111/patch-1
Remove notable project youtube-dl
2020-10-29 20:10:00 -07: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
Waldir Pimenta
a86a42c06a Fix a typo in the terms of service 2020-10-13 17:59:43 +01:00
Waldir Pimenta
3e2b69c68a Harmonize quotation marks and apostrophes
Use straight marks in source files (txt, md)
and curly marks in rendered files (html)
2020-10-13 17:56:36 +01:00
Waldir Pimenta
c915a5a8da Harmonize capitalization in section headings 2020-10-13 17:56:35 +01:00
Mike Linksvayer
20eaccfa54
Merge pull request #779 from ObserverOfTime/using-map
Convert license `using` array to map
2020-10-05 11:03:15 -07:00
Mike Linksvayer
926d3eb55d more concise comment 2020-10-03 11:35:53 -07:00
Mike Linksvayer
0e344b6713 update templates to use using map 2020-10-03 11:31:20 -07:00
ObserverOfTime
e655e40c30
Fix linter warning 2020-10-03 12:01:45 +03: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
96d90b1fe5
Merge pull request #771 from github/cici
Don't trigger CI twice for PRs
2020-09-13 18:31:10 -07:00
Mike Linksvayer
33a6799a1d
Don't trigger CI twice for PRs 2020-09-13 18:24:10 -07:00