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

1825 Commits

Author SHA1 Message Date
Mike Linksvayer
21b959fc28
Merge pull request #760 from github/newcops
Suppress warning about pending cops, changes suggested by enabled cops
2020-07-30 12:02:45 -07:00
Mike Linksvayer
3074bf679a Suppress warning about pending cops, changes suggested by enabled cops 2020-07-30 11:53:51 -07:00
Mike Linksvayer
7e2358e3c1
Merge pull request #759 from github/material
Generalize software->licensed material in permission/condition/limitation descriptions
2020-07-27 10:32:36 -07:00
Mike Linksvayer
8d8eeee9ff spel 2020-07-26 12:11:00 -07:00
Mike Linksvayer
e94c302194 re add articles, this license consistency 2020-07-26 12:08:18 -07:00
Mike Linksvayer
bc6e57a844 rm unhelpful articles and demonstratives 2020-07-25 16:42:11 -07:00
Mike Linksvayer
fa93f75daf Generalize software->licensed material in permission/condition/limitiation descriptions
Fixes #743
2020-07-24 12:52:33 -07:00
Mike Linksvayer
cadd29303e
Merge pull request #757 from astagi/patch-1
Love is ❤️
2020-07-23 12:33:15 -07:00
Mike Linksvayer
2d9e5be8c2 slightly reduce branches apparent to rubocop to satisfy rubocop 2020-07-23 12:28:53 -07:00
Mike Linksvayer
40fff59824
match pages gem 2020-07-23 11:30:09 -07:00
Mike Linksvayer
5180893b2a
match pages gem 2020-07-23 11:29:37 -07:00
Andrea Stagi
9e58d46b2f
Love is ❤️ 2020-07-23 20:15:27 +02:00
Mike Linksvayer
851a87f172
Merge pull request #752 from github/upl-example-update
Update UPL-1.0 example
2020-07-08 08:45:58 -07:00
Mike Linksvayer
804bfb71e9 Update UPL-1.0 example
Fixes broken link
2020-07-08 08:37:10 -07:00
Mike Linksvayer
8e3c58fdbb
Merge pull request #744 from github/repos-eg-github
Make repository use requirement for adding a license slightly more generic
2020-06-21 15:58:55 -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
6f9f1e3f45 licensee moved from benbalter user to licensee org 2020-06-21 15:38:38 -07:00
Mike Linksvayer
b72d00974d branch rename for 3 examples 2020-06-21 15:32:37 -07:00
Mike Linksvayer
ba52018723
Pages Ruby version bumped
Fix this failure

 ruby version in .travis.yml and pages ruby version match
     Failure/Error: expect(ci_ruby_version).to eql(pages_ruby_version), msg
       2.5.3 != 2.5.8; please add a commit bumping in .travis.yml
2020-06-21 15:25:56 -07:00
Mike Linksvayer
14885cff71
Make repository use requirement for adding a license slightly more generic
Conceivably there could be substantial evidence in public repositories outside GitHub, move GitHub search to eg. Fixes #739
2020-06-21 15:19:38 -07:00
Mike Linksvayer
2467d15902
Merge pull request #736 from github/update-examples
Update example uses
2020-05-18 12:18:41 -07:00
Mike Linksvayer
3628e08299 Update example uses 2020-05-18 12:14:02 -07:00
Mike Linksvayer
2469766a7e
Merge pull request #730 from jayaddison/link-to-non-deprecated-gpl-licenses
Update GPL links to point to SPDX pages without deprecation warnings
2020-04-10 09:15:55 -07:00
James Addison
f4f78a5f8f
Update _includes/sidebar.html
Co-Authored-By: Mike Linksvayer <mlinksva@github.com>
2020-04-10 10:45:53 +01:00
James Addison
3863938ff2 Revert "Sidebar links: Update LGPL-3.0 special case"
This reverts commit 2997310cf80b7653c77ac3628dbd6e7efa27b4ad.
2020-04-10 07:31:16 +01:00
James Addison
2997310cf8 Sidebar links: Update LGPL-3.0 special case 2020-04-10 01:15:47 +01:00
James Addison
3c5daf9cfc Sidebar links: link to SPDX GPL license pages without deprecation warnings 2020-04-10 01:14:06 +01:00
Mike Linksvayer
904bdf06ff
Merge pull request #727 from waldyrious/cc-fmt
Fix formatting of Creative Commons licenses
2020-03-31 10:57:50 -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
Mike Linksvayer
33c0e3a39f
Merge pull request #722 from waldyrious/patch-1
ISC examples: replace helix with starship
2020-02-29 11:18:50 -08:00
Waldir Pimenta
e8fd008979
ISC examples: replace helix with starship 2020-02-29 13:46:54 +00:00
Mike Linksvayer
0721104642
Merge pull request #719 from github/revertfaradayworkaround
Revert temporary faraday workaround
2020-01-24 11:43:04 -08:00
Mike Linksvayer
06c47f2097 Revert "temporary workaround for https://github.com/github/pages-gem/issues/665"
This reverts commit fd32f9f07812244383b624100e9f1d7540324e29.
2020-01-24 11:39:40 -08:00
Mike Linksvayer
4e277c4652
Merge pull request #717 from othree/vim
Add vim.txt
2020-01-23 10:21:43 -08: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
Mike Linksvayer
34a206fcb2
Merge pull request #716 from waldyrious/usage-instructions
Standardize structure of first sentence of usage instructions
2020-01-19 13:05:14 -08:00
Waldir Pimenta
134657d43e Standardize structure of first sentence of usage instructions 2020-01-19 19:54:58 +00:00
Mike Linksvayer
7245422df4
Merge pull request #715 from waldyrious/adjust-appendix-phrasing
Reword usage note about recommended notices
2020-01-18 13:01:42 -08: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
Mike Linksvayer
6642fd15cb
Merge pull request #714 from zisk/patch-1
Update link to .NET Core license file
2020-01-17 09:53:13 -08:00
Mike Linksvayer
fd32f9f078 temporary workaround for https://github.com/github/pages-gem/issues/665 2020-01-17 09:50:41 -08: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
cb897a7471
Merge pull request #711 from github/unhidebsl
Show BSL-1.0 between MIT and Unlicense in license spectrum
2019-12-27 09:55:20 -08: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
e32336e5a8
Merge pull request #710 from github/rmtrailingwhitespace
rm unneeded trailing whitespace from various files
2019-12-26 11:59:52 -08:00