1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-12 22:48:54 +01:00
Commit Graph

1713 Commits

Author SHA1 Message Date
Mike Linksvayer
24b87ca27c
Merge pull request #834 from wswartzendruber/enhancement/osl-afl-3.0-consistency
Making the OSL-3.0 and AFL-3.0 formatting consistent with each other.
2021-07-05 21:44:11 -07: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
acfc2a8724
Merge pull request #835 from github/bsd3-flutter
Update BSD-3-Clause examples because d3 is now ISC licensed
2021-07-05 21:35:27 -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
b2e3f43e7f
Merge pull request #832 from github/ruby273
update ruby version to match github-pages gem
2021-06-06 10:46:01 -07:00
Mike Linksvayer
c52ac07d8e
update ruby version to match github-pages gem 2021-06-06 12:41:02 -05:00
Mike Linksvayer
ebf76c2f97
Merge pull request #831 from r00ster91/patch-3
Improve sidebar reference links
2021-05-29 19:02:27 -07:00
r00ster
9b74f0ea65
Improve sidebar reference links 2021-05-29 23:55:46 +02:00
Mike Linksvayer
42466b799a
Merge pull request #823 from github/webrick
Add webrick to Gemfile so jekyll serve works under ruby 3
2021-04-05 00:19:02 -07:00
Mike Linksvayer
3494f9e011
rubocop 2021-04-05 00:17:33 -07:00
Mike Linksvayer
91817e84d4
Add webrick to Gemfile so jekyll serve works under ruby 3
As noted in https://github.com/github/choosealicense.com/issues/822
2021-04-05 00:13:49 -07:00
Mike Linksvayer
b5a6416045
Merge pull request #821 from github/ruby3
Allow bundle updae and tests to be run under ruby 3
2021-04-04 23:10:40 -07:00
Mike Linksvayer
ec9bbeaeae
Allow bundle updae and tests to be run under ruby 3 2021-04-04 23:09:00 -07:00
Mike Linksvayer
0c4ee982e5
Merge pull request #819 from github/mulan-nickname
Add Mulan PSL v2 as nickname for MulanPSL-2.0
2021-04-04 22:20:43 -07:00
Mike Linksvayer
f807d03fae
Add Mulan PSL v2 as nickname for MulanPSL-2.0 2021-04-04 20:36:09 -07:00
Mike Linksvayer
b9f5d35d15
Merge pull request #818 from TheInterestingSoul/gh-pages
Add the Mulan-PSL v2 license
2021-04-04 19:51:01 -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
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 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
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