1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-09 21:18:53 +01:00
Commit Graph

1508 Commits

Author SHA1 Message Date
Mike Linksvayer
b9905b11dd Merge branch 'gh-pages' into home-reform 2016-12-12 19:27:18 -08:00
Mike Linksvayer
b6303411de Merge branch 'gh-pages' into warranty 2016-12-12 19:26:53 -08:00
Mike Linksvayer
c43ee38d12 Merge pull request #468 from github/cowan-wizard
New home for John Cowan's license selection wizard
2016-12-12 19:26:36 -08:00
Mike Linksvayer
74ec63ec1b order gems so rubocop doesn't complain 2016-12-12 17:36:13 -08:00
Mike Linksvayer
a0120c2f21 New home for John Cowan's license selection wizard
Waybacked in c008a5fbef, Cowan now has a new home, updating to that.
2016-12-12 17:21:28 -08:00
Mike Linksvayer
ff7cfdc44c order gems so rubocop doesn't complain 2016-12-12 14:34:21 -08:00
Mike Linksvayer
57f7891273 no-liability -> liability, warranty
rename and add tag and associated descriptions

fixes #412
2016-12-12 14:29:25 -08:00
Mike Linksvayer
bba25c9cbb Merge pull request #459 from anandtrex/gh-pages
Adding a link in the about page to FSF's advice on how to choose a license
2016-10-10 15:27:03 -07:00
Mike Linksvayer
306ffb0194 fold 2 FSF links into one bullet 2016-10-10 15:25:29 -07:00
Anand
47048d41e7 Adding a link in the about page to FSF's advice on how to choose a
license for your work.
2016-10-10 23:42:52 +02:00
Mike Linksvayer
08d8173bd8 Merge pull request #456 from github/unhidden-criteria
hidden: false for 'popular' licenses
2016-09-26 13:34:07 -07:00
Mike Linksvayer
570f69e4ec hidden: false for 'popular' licenses
- document criteria for whether a license is hidden
  - needed for license spectrum on /licenses OR
  - on 'popular' list at https://opensource.org/licenses (some other list could be used in the future)
- adjust license properties and tests accordingly

This gets non-hidden list back close to what it was before #386 and (pending licensee vendoring this change, licensee release, and github.com licensee dependency version bump) some commonly requested licenses (eg #413 #449) will reappear in the github.com license drop-down.
2016-09-26 11:20:44 -07:00
Mike Linksvayer
b396361036 Merge pull request #455 from github/already-cataloged-licenses
appendix link to see whether license already cataloged
2016-09-18 17:19:15 -07:00
Mike Linksvayer
14059979cd comma 2016-09-18 16:56:24 -07:00
Mike Linksvayer
33107b8baa appendix link to see whether license already cataloged
Inspired by https://github.com/github/choosealicense.com/issues/454 asking for an already-cataloged license to be added.
2016-09-18 13:58:15 -07:00
Mike Linksvayer
da9e5def26 Merge pull request #453 from github/for-no-pipe
remove | sort from for loops, avoid new(?) liquid warning
2016-09-17 08:07:11 -07:00
Mike Linksvayer
5003e9755f Merge branch 'gh-pages' into for-no-pipe 2016-09-17 08:05:21 -07:00
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
856110468e Merge branch 'gh-pages' into home-reform 2016-07-02 11:54:51 -07: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