1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-14 07:28:53 +01:00
Commit Graph

1404 Commits

Author SHA1 Message Date
Mike Linksvayer
cf79b35e06 re-add optional hidden field, default to true
licenses on /licenses have `hidden: false` set

fixes #434
2016-06-14 10:35:44 -07:00
Mike Linksvayer
c8de57aba7 Merge pull request #432 from saraford/gh-pages
Updated footer to link to GitHub repo for ChooseALicense
2016-06-13 11:23:55 -07:00
Sara Ford
22212ae035 Updated footer to link to GitHub repo for ChooseALicense 2016-06-13 10:57:40 -07:00
Mike Linksvayer
77094c25de Merge branch 'gh-pages' into home-reform 2016-06-12 15:48:17 -07:00
Mike Linksvayer
dcc34638af Merge pull request #430 from github/license-years-contributors
update year, add contributors
2016-06-10 09:25:08 -07:00
Mike Linksvayer
a3f0f81919 update year, add contributors 2016-06-09 16:24:32 -07:00
Mike Linksvayer
22beacdfc9 Merge remote-tracking branch 'origin/gh-pages' into home-reform 2016-06-07 08:52:25 -07:00
Mike Linksvayer
64f0fc9b02 Merge pull request #428 from github/small-link-appendix
small link to appendix & improve for linking, guiding back to home page
2016-06-07 08:10:39 -07:00
Mike Linksvayer
4aa540f154 Add existing project situation, leave 1 permissive, 1 copyleft choice
This is a **draft**, probably will be controversial, definitely needs
wordsmithing.

Fixes #380 "No clear message on why to choose an open source license"
-- added line under heading

Fixes #335 "Feedback from John Sullivan talk on license choosers"
-- remaining items were (roughly) to not surface patents at this
level, and to surface choice between allowing proprirary/closed
source or not

Fixes #239 "Consider discussing ecosystems with an already predominant
license" (well, it doesn't *discuss* but there's a page for that,
unlinked til now) and makes the default recommendation of just about
everyone -- use exisitng project/community's license if applicable
-- prominent on the site

Closes #48 "Proposed modified workflow: make permissive/copyleft
and patents orthogonal" though probably not in way submitter would
favor. I could be convinced that Apache-2.0 should be featured
rather than MIT because of the former's express patent grant, but
as it stands I'm not sure the complexity of Apache-2.0 (and for a
weak grant, relative to GPLv3) is worth it relative to MIT. There's
some value in the first license a user looks at being really easy
to understand. The continued popularity of MIT and simialar ISC and
BSD-2/3 seems to indicate people want that simplicity. And where
are the holdups based on patents supposedly infringed by open source
projects under licenses without an express patent grant that could
not have happened had those projects been under Apache-2.0? Please
educate me! :)

Any and all feedback most welcome.
2016-06-06 18:31:14 -07:00
Mike Linksvayer
827d62cc28 vertical spacing 2016-06-06 10:25:18 -07:00
Mike Linksvayer
83c39a345d small link to appendix & improve for linking, guiding back to home page
Based on feeedback from people looking for BSD licenses and wanting to
use site as a reference.

I'm not thrilled with any distraction from flow of choices that
work for most on home page through spectrum covering range of open
source licenses without redundant ones, but obviously some people
prefer seeing everything in a table, so let them find it, accommodate
use as reference and people whose learning style involes poring
over a reference rather than being guided.
2016-06-06 10:15:22 -07:00
Mike Linksvayer
2e2185549c Merge pull request #426 from github/highlight-target-id
highlight target id to make link#id behavior more apparent
2016-06-05 10:03:36 -07:00
Mike Linksvayer
f37bad97ec highlight target id to make link#id behavior more apparent
suggested by @LeoFNaN at
https://github.com/github/choosealicense.com/pull/411#issuecomment-223729386
2016-06-04 15:27:47 -07:00
Mike Linksvayer
7cefe4c92d rm unncessary 'additionally' 2016-06-03 10:25:30 -07:00
Mike Linksvayer
202c715b79 Merge pull request #396 from github/functional-descriptions
Rework descriptions of 7 listed on /licenses
2016-06-03 10:23:53 -07:00
Mike Linksvayer
b527e10318 Merge branch 'gh-pages' into functional-descriptions 2016-06-03 10:11:17 -07:00
Mike Linksvayer
6d8339765e remove somewhat redundant words 2016-06-03 10:10:08 -07:00
Mike Linksvayer
3b8047917e Merge pull request #421 from github/package-metadata
License identifiers and package descriptions hint
2016-06-02 13:55:17 -07:00
Mike Linksvayer
f09d10922f reword, emphasize optional 2016-06-02 12:17:20 -07:00
Mike Linksvayer
2e7b84b816 reword: note optional, mention effect; make slightly less prominent 2016-06-02 11:57:32 -07:00
Mike Linksvayer
d6f7e196ca Merge branch 'gh-pages' into functional-descriptions 2016-06-01 09:01:10 -07:00
Mike Linksvayer
856f3a96c9 Merge branch 'gh-pages' into package-metadata 2016-06-01 09:00:38 -07:00
Mike Linksvayer
9b925d8437 Merge pull request #423 from github/bill-auger-patch-1
Make non-license (non-)permissions more explicit
2016-06-01 08:59:30 -07:00
Mike Linksvayer
ecc8acd7eb Merge branch 'gh-pages' into bill-auger-patch-1 2016-06-01 08:43:16 -07:00
Mike Linksvayer
4ff8a2bec6 Merge pull request #424 from github/non-mutable-id
make tests not overwrite non-mutable document 'id'
2016-06-01 08:42:58 -07:00
Mike Linksvayer
b99e7ab017 replace 'id' variables with 'spdx_lcase' to minimize confusion 2016-06-01 08:36:56 -07:00
Mike Linksvayer
49fca01280 make tests not overwrite non-mutable document 'id' 2016-05-31 15:44:12 -07:00
Mike Linksvayer
0c26959bc0 abbreviate suggestion from @bill-auger 2016-05-31 09:39:14 -07:00
bill auger
24f6891f9c expansion/clarification of non-license permissions
I made some suggestions to this documentation today because I have been wondering about these ambiguities for years and am recently, trying to convince a repo maintainer to add a license to his repo which has over 1000 regular users; but this document (even the section: "Ask the maintainers nicely to add a license") offers nothing convincing to that end.  In fact, it is barely self-consistent, and the GitHub TOS is so terse on the topic that it is not at all clear what this document implies specifically for GitHub users.

The one paragraph states that GitHub public repos are forkable (and actually download-able) regardless of the license or lack thereof.  Then the very next paragraph states that without a license users may not use the material in ANY way.  This avoids blatant contradiction only by omitting that, strictly speaking, without a license the rights do not exist to copy or fork either.

I hope this edit will serve to inform users until perhaps GitHub more clearly defines the limits of the permissions granted in section F1 of the TOS.  Until then, I hope that the drafters of the GitHub TOS would read this PR mindfully and note that it raises some important issues.
2016-05-31 08:28:32 -04:00
Mike Linksvayer
6b2eaebac5 add '+' to spdx id if _GPL 2016-05-30 18:34:51 -07:00
Mike Linksvayer
37e3a00efb add spdx id w/hint about adding to pkg description to sidebar 2016-05-30 18:20:45 -07:00
Mike Linksvayer
4551fddd88 Merge pull request #420 from github/table-scope
add scope=col or row to appendix table
2016-05-30 14:30:22 -07:00
Mike Linksvayer
c9dbe70f03 add scope=col or row to appendix table
as recommended by
https://www.w3.org/WAI/tutorials/tables/two-headers/
http://webaim.org/techniques/tables/data
2016-05-29 13:16:41 -07:00
Mike Linksvayer
c8ff52d9e8 Merge pull request #419 from jlovejoy/patch-1
Update about.md
2016-05-26 14:06:23 -05:00
Jilayne Lovejoy
e161092270 Update about.md
fix list item for SPDX License List to reflect formal name
2016-05-26 12:09:58 -06:00
Mike Linksvayer
027890a5a8 Merge pull request #418 from github/nicknames-for-all
Make nickname a required meta field
2016-05-25 17:43:28 -05:00
Mike Linksvayer
e5f46faa30 test required spdx-ids against data from spdx 2016-05-25 08:53:23 -05:00
Mike Linksvayer
28e4765dfe spdx-id required, nickname only for licenses with customary short names 2016-05-24 16:21:13 -05:00
Mike Linksvayer
6fe44f4637 Make nickname a required meta field
Add missing nicknames
Use SPDX ID if no customary nickname (eg GNU GPLv3) exists

This ensures that a relatively compact name is always available

I may be missing some obvious customary names, e.g., is "Eclipse
1.0" customary? For now I've used the SPDX ID, EPL-1.0.
2016-05-24 14:21:29 -05:00
Mike Linksvayer
ce2838f7a0 Merge pull request #415 from ploctaux/gh-pages
Fixed bsd3 licenses
2016-05-23 16:40:02 -05:00
Philippe Loctaux
4c4f200344 Update bsd-3-clause.txt 2016-05-23 23:28:53 +02:00
Philippe Loctaux
4636330a4c Update bsd-3-clause-clear.txt 2016-05-23 23:28:32 +02:00
Philippe Loctaux
78f4c90012 Merge branch 'gh-pages' into gh-pages 2016-05-23 21:30:22 +02:00
Mike Linksvayer
3f2f0b0efa Merge pull request #411 from github/legend
Legend for appendix table of licenses
2016-05-23 08:44:32 -05:00
Mike Linksvayer
2e333a01bc Merge branch 'gh-pages' into legend 2016-05-23 08:41:50 -05:00
Mike Linksvayer
66ae5b1b60 Merge pull request #416 from pombredanne/patch-1
Add SPDX license list reference
2016-05-23 08:40:14 -05:00
Philippe Loctaux
edbb88820a Update bsd-3-clause-clear.txt
fixed spelling
2016-05-23 08:27:44 +02:00
Philippe Loctaux
f58d55c699 Update bsd-3-clause.txt
fixed spelling
2016-05-23 08:27:24 +02:00
Philippe Ombredanne
76326f87b0 Fix markdown syntax for SPDX link. 2016-05-22 21:03:42 +02:00
Philippe Ombredanne
ce5b42e510 Add SPDX license list reference
It may be relevant to add a link to SPDX as even though  SPDX is referenced is many other places in the repo, it does not show up in the about.md.
That would a nice addition! (disclaimer: I am on of the SPDX co-founders)
2016-05-22 18:49:10 +02:00