1
0
mirror of https://github.com/github/choosealicense.com synced 2024-07-17 15:42:41 +02:00
Commit Graph

216 Commits

Author SHA1 Message Date
Haacked
d99c259830 Fix #133 issue with lgpl tab 2013-11-19 16:02:50 -08:00
Haacked
86854bc0dd Remove links from LGPL description 2013-11-19 10:28:26 -08:00
Haacked
7ab42bd87c uppercase dat mit 2013-11-18 17:57:08 -08:00
Haacked
6f36d6bfcb Hide pill nav for a single license 2013-11-18 17:00:15 -08:00
Haacked
4ce71929ad Merged master 2013-11-18 15:06:19 -08:00
Haacked
94389c5873 Implement license family tabs 2013-11-18 14:48:32 -08:00
enyst
4c2fa2692d CC0 fallback license is non sublicensable.
(cf. https://creativecommons.org/publicdomain/zero/1.0/legalcode)

Signed-off-by: enyst <engel.nyst@gmail.com>
2013-11-17 00:12:34 +02:00
Dave Crossland
e1ba0ac871 Adding OFL 2013-11-13 20:35:33 -05:00
Jason Long
f28894d905 made partial for license overview sections 2013-11-06 11:24:34 -05:00
Phil Haack
26b54fc2dc Merge pull request #125 from JoshData/rename-public-domain
"Public Domain" is not the name of a license, the title of "Unlicense" should be something else
2013-11-05 20:24:18 -08:00
Joshua Tauberer
3fa2799c40 rewrap to 78 characters, per #126 and #74 2013-11-05 19:04:20 -05:00
Joshua Tauberer
2cfb8588a1 add cc0 license 2013-11-05 13:35:44 -05:00
Joshua Tauberer
60edf7316d 'Public Domain' is not the name of a license; the Unlicense should at the least be called 'Public Domain Dedication', and the permalink should be called 'unlicense' to distinguish it from other methods of making a public domain dedication 2013-11-05 13:09:45 -05:00
BJ Dierkes
5e487d06a7 Resolves Issue #74 2013-10-31 17:29:24 -05:00
XhmikosR
d1ae44f146 Remove trailing spaces. 2013-10-30 20:34:52 +02:00
Haacked
64097df8f0 Add private-use to every license
There is no license that prohibits private use.
2013-10-30 10:10:02 -07:00
Phil Haack
40a2b5cbad Merge pull request #78 from engelnyst/artistic
Artistic license is not copyleft
2013-10-28 17:17:17 -07:00
Phil Haack
544d8f45c8 Merge pull request #71 from weakish/gh-pages
make notations of no-license more coherent
2013-10-28 17:09:18 -07:00
Haacked
95d34dc9bd Group licenses together 2013-10-28 16:48:57 -07:00
Phil Haack
7ec8e0630f Merge pull request #103 from IQAndreas/fix-artistic-license-formatting
Use the plaintext formatting of the Artistic License 2.0
2013-10-23 19:21:55 -07:00
Andreas Renberg (IQAndreas)
1e50a84d47 Add fields for year and fullname
See
https://github.com/github/choosealicense.com/pull/103#issuecomment-26914863
2013-10-24 02:53:20 +02:00
Aidan Feldman
677674114b fix indentation of projects using Eclipse 2013-10-23 09:43:11 -07:00
Aidan Feldman
1aaa72baae Merge branch 'gh-pages' of github.com:waynebeaton/choosealicense.com into waynebeaton-gh-pages 2013-10-23 09:41:35 -07:00
Aidan Feldman
af62acc3f6 remove garbage 'using' link 2013-10-22 23:58:31 -07:00
Andreas Renberg (IQAndreas)
c3f8ee7c88 Use the plaintext formatting of the Artistic License 2.0
Another case where the license was copied from HTML, but had a nicely
formatted plaintext version (this is the last one, I promise).

This time the source was taken from
<http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt>
2013-10-23 08:53:11 +02:00
Andreas Renberg (IQAndreas)
dc58abef62 Add license sources where missing 2013-10-23 08:09:55 +02:00
Andreas Renberg (IQAndreas)
f07c1f9beb Change braces to match the rest of the site 2013-10-22 14:21:04 +02:00
Andreas Renberg (IQAndreas)
d2b1145e6d Switch to use the plaintext formatting for Apache License
It's very clear that the site had copied over the HTML version of the
Apache License.

See [lines 122 to
142](4e2fd06748/licenses/apache.txt (L122))
as an example where the unordered list bullets not copied in along with
the rest of the text, throwing off the formatting and bunching together
text.

Since the site is displaying the plaintext version of the license, it
makes more sense to use the nicely formatted [plaintext version provided
by Apache](http://www.apache.org/licenses/LICENSE-2.0.txt).
2013-10-22 14:14:30 +02:00
Wayne Beaton
bee7665b86 Updated the description and using statements in eclipse.txt 2013-10-17 13:59:11 -04:00
enyst
2329a74692 More concise Artistic license description. 2013-08-19 16:49:48 +03:00
enyst
5a201367c4 Add note about the condition on modified versions to the description of Artistic. 2013-08-19 04:41:05 +03:00
enyst
7ed07c572f Artistic license is not copyleft. Fixes #73
Signed-off-by: enyst <engel.nyst@gmail.com>
2013-08-19 04:35:24 +03:00
Jakukyo Friel
86f22c87d6 make notations of no-license more coherent
- make notations of /no-license.md and licenses/no-license.html
  more coherent
- clarify only publishing code on a *public* repo on github grants
  others the right to view and fork your code in
  licenses/no-license.html
2013-07-26 17:46:54 +08:00
CamilleM
688abde66c Removing double quotes from names 2013-07-23 17:48:20 +02:00
CamilleM
efa2996385 udpating permalink to unlicense instead of public domain 2013-07-23 17:37:23 +02:00
CamilleM
ea1de63fa6 Fixing CTKI pb 2013-07-23 15:37:43 +02:00
CamilleM
dc525aa42e solving merge conflict 2013-07-23 15:31:12 +02:00
CamilleM
e02ec17a95 Shorter license names 2013-07-23 15:28:27 +02:00
CamilleM
d17d053844 Shorter license names 2013-07-23 15:05:26 +02:00
CamilleM
0161a3d75d getting unlicense text into CC0 file for merge 2013-07-23 13:37:38 +02:00
CamilleM
bde9ce780d Updating license filenames, titles and permalinks to match SPDX standard 2013-07-22 11:25:33 +02:00
CamilleM
9f01c1a41b Updating licenses filenames, titles and permalinks to follow SPDX standard 2013-07-22 11:21:50 +02:00
Kent R. Spillner
f1a1981818 Fix template parameter markers in ISC license.
License template parameters are surrounded by square brackets, not
angle brackets.  Drop extension from source: as it's unnecessary.
Add more details to description:.  Add note: and filename:.  Add
private-use and sort permissions.
2013-07-19 21:57:16 +02:00
Ben Lavender
97e3bf2867 Fix description on artistic license 2013-07-19 21:48:57 +02:00
Ben Lavender
e2df8c25ee These are actually advertisements to use the gpl, not copyright notices 2013-07-19 21:48:57 +02:00
Ben Lavender
16ded95b40 This is probably more correct 2013-07-19 21:48:57 +02:00
Ben Lavender
36e348b5f0 gplv2 has a link 2013-07-19 21:48:57 +02:00
Ben Lavender
489c2600a8 These are just parens. 2013-07-19 21:48:57 +02:00
Ben Lavender
86e224bb54 single angle braces for links and curly braces for non-vars 2013-07-19 21:48:56 +02:00
Ben Lavender
fae1d8dfbe Fix inconsistent replace clauses in BSD 3 clause 2013-07-19 21:48:56 +02:00
Ben Lavender
33d7739819 No more interpolating << 2013-07-19 21:48:56 +02:00
Ben Lavender
6cbc1990d2 Link the unlicense and specificity about waiving 2013-07-19 21:48:56 +02:00
Ben Lavender
b4399dadbd Unlicense is called UNLICENSE 2013-07-19 21:48:56 +02:00
Ben Lavender
2bc5c6e838 Fix << >> and < > and { } urls 2013-07-19 21:48:55 +02:00
Phil Haack
e1cc952611 hwhoops! Quick fix. 2013-07-19 21:48:55 +02:00
Ben Lavender
67cf12a54a Words again 2013-07-19 21:48:55 +02:00
Ben Lavender
407610d715 Fix wording a little 2013-07-19 21:48:55 +02:00
Ben Lavender
996a04ab74 Use the unlicense instead of CC0 to represent the public domain 2013-07-19 21:48:55 +02:00
Roland Hieber
3edf479745 BSD licenses: bring back the list bullets 2013-07-19 03:15:18 +02:00
Ben Lavender
14bd7cbaed Fix description on artistic license 2013-07-17 17:51:33 -05:00
Ben Lavender
7e7e54d3df These are actually advertisements to use the gpl, not copyright notices 2013-07-17 17:50:31 -05:00
Ben Lavender
61ed4a518c This is probably more correct 2013-07-17 17:48:22 -05:00
Ben Lavender
dc31ddcbe8 gplv2 has a link 2013-07-17 17:43:01 -05:00
Ben Lavender
871eee21de These are just parens. 2013-07-17 15:33:39 -05:00
Ben Lavender
4e2fd06748 single angle braces for links and curly braces for non-vars 2013-07-17 15:32:20 -05:00
Ben Lavender
7ecc0c06d9 Fix inconsistent replace clauses in BSD 3 clause 2013-07-17 12:00:40 -05:00
Ben Lavender
babcaa2a18 No more interpolating << 2013-07-17 11:57:57 -05:00
Ben Lavender
88e4101ce3 Link the unlicense and specificity about waiving 2013-07-17 11:41:30 -05:00
Ben Lavender
ad66f7d405 Unlicense is called UNLICENSE 2013-07-17 11:39:25 -05:00
Ben Lavender
e0ad6dee44 Fix << >> and < > and { } urls 2013-07-17 11:38:47 -05:00
Juan Francisco Cantero Hurtado
f89201c7f4 Adds ISC License 2013-07-17 02:52:32 +02:00
Phil Haack
37f77b1ba4 hwhoops! Quick fix. 2013-07-16 17:25:59 -07:00
Ben Lavender
3250493b77 Words again 2013-07-16 11:33:43 -05:00
Ben Lavender
18b473fd17 Fix wording a little 2013-07-16 11:19:13 -05:00
Ben Lavender
ddfbee3953 Use the unlicense instead of CC0 to represent the public domain 2013-07-16 01:11:04 -05:00
Haacked
fb5546db7f Changing license featured on github.com
This flag controls which license is featured on github.com.
2013-07-15 13:51:09 -07:00
dpen2000
c0e377b4ce Update eclipse.txt - include disclose-source 2013-07-15 19:59:24 +01:00
dpen2000
73c1efe44f Remove include-license (covered by include-copyright) 2013-07-15 19:51:45 +01:00
Ben Balter
c863d3dcf8 Use proper AGPL source link 2013-07-15 14:30:59 -04:00
Ben Balter
3731105442 Merge pull request #11 from rahearn/fix-affero-text
Use Affero GPL text instead of GPLv3
2013-07-15 11:30:09 -07:00
Ben Balter
9543057018 license/ should link to the "no-license" license, not to /no-license 2013-07-15 14:10:31 -04:00
Ryan Ahearn
ba0ae09a11 Use Affero GPL text instead of GPLv3 2013-07-15 13:38:07 -04:00
Anne Epstein
10d5b7a27f Add license name to MIT license
It's very helpful/timesaving to people considering making use of a project for the license text to have the title, so they don't have to do a search to confirm what the license is. Therefore, the portion of the MIT license that gets copied to clipboard should have the license title.
2013-07-15 12:30:15 -05:00
James Dennes
9dbb60c5c6 Use Absolute Permalinks
This removes the deprecation warning about absolute permalinks. Absolute Permalinks will be the default as of Jekyll v1.1: http://jekyllrb.com/docs/upgrading/
2013-07-14 15:32:06 +02:00
Patrick Reynolds
2270711771 fix #88 - broken relative links 2013-07-13 01:16:15 -05:00
Haacked
98f7a3c730 Fix link in public domain license 2013-07-12 16:18:48 -07:00
Haacked
fb92ca1707 Removed warranty category 2013-07-12 15:01:08 -07:00
Haacked
dca341d472 Making things less lawyery 2013-07-12 14:58:56 -07:00
Haacked
300f796aa9 Add no-liability to public domain 2013-07-12 14:58:56 -07:00
Haacked
f0f4402f35 Added patent-grant category 2013-07-12 14:58:56 -07:00
Haacked
c4c48d498c Change nonstatic to library usage
Per review, we should call it library usage. Also pointed out that LGPL
does require disclosing source.
2013-07-12 14:58:56 -07:00
Haacked
2c0cda0e53 Fixup GPL description 2013-07-12 14:58:56 -07:00
Haacked
3c29d5da87 Replace copyright and license with single category 2013-07-12 14:58:56 -07:00
Phil Haack
8ae1c78757 Merge pull request #85 from github/mit-bsd-sync
Clarify bsd 2 clause
2013-07-12 14:58:28 -07:00
Haacked
fd1ea0b72d Improve public domain description 2013-07-12 14:51:14 -07:00
Ben Balter
c90a6a615c clarify bsd 2 clause 2013-07-12 14:58:06 -04:00
Ben Balter
47a12aca16 Add comma 2013-07-10 15:00:18 -04:00
Haacked
776046f049 Add public domain license 2013-07-10 11:20:40 -07:00
Phil Haack
e265b4b988 Merge pull request #72 from github/license-relative-links
licenses: make all permalinks relative
2013-06-15 12:29:49 -07:00
Phil Haack
13750495a1 Merge pull request #71 from github/bsd-license-text
Bsd license text
2013-06-15 12:29:14 -07:00