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

185 Commits

Author SHA1 Message Date
Ben Balter
bf54584c82 add source back to unlinces 2014-06-17 13:08:07 -04:00
Ben Balter
b2c5f26ed6 remove double layout in gplv3 2014-06-17 13:07:21 -04:00
Ben Balter
5346f5821e remove whitepsace in gpl 2014-06-17 13:06:52 -04:00
Ben Balter
383c5ea2f6 resolve merge conflict in BSD 2014-06-17 13:06:26 -04:00
Ben Balter
79513f0975 downcase all filenames, resolve merge conflicts 2014-06-17 13:00:30 -04:00
Ben Balter
8a542b1268 Merge branch 'gh-pages' of https://github.com/alejandrosantana/choosealicense.com into alejandrosantana-gh-pages 2014-06-17 11:52:25 -04:00
Alejandro Santana
e0666e52ce [IMP] Added redirect_from policy to agpl-v3.txt 2014-06-17 11:34:31 +02:00
Ben Balter
7e6a492a57 Merge pull request #197 from kappa7194/patch-1
Missing "patent grant" feature in AGPL
2014-06-15 21:00:40 -04:00
Ben Balter
a9ee5cf9cb make ISC primary BSD-style license 2014-06-14 14:59:49 -04:00
Alejandro Santana
b744b704ba [DEL] Deleted agpl-v1.txt and agpl-v2.txt to avoid bloating, as agpl-v3 is intented to replace those previous versions. 2014-06-06 18:42:00 +02:00
Alejandro Santana
f4260aad10 [FIX] Fixed tab-slug in agpl-v3.txt 2014-06-05 09:53:47 +02:00
Alejandro Santana
9628170ed4 [FIX][ADD] Renamed agpl.txt to agpl-v3.txt to match the license contained (GNU AGPL-v3). Also added licenses agpl-v1.txt and agpl-v2.txt (not GNU) 2014-06-05 09:49:53 +02:00
Juan Francisco Cantero Hurtado
52adce23ab Typo 2014-06-02 22:31:22 +02:00
Albireo
7a80bef759 Missing "patent grant" feature in AGPL
The AGPL license is missing the "patent grant" feature in the "permitted" category.

Unless I'm mistaken [section 11](http://www.gnu.org/licenses/agpl-3.0.html#section11) of the license is about granting patents licenses (it's the same text found in [GPLv3's section 11](http://www.gnu.org/licenses/gpl-3.0.html#section11)).
2014-04-22 12:14:48 +02:00
Juan Francisco Cantero Hurtado
6e0cce18e1 Merge branch 'gh-pages' into isc 2014-04-10 20:02:52 +02:00
XhmikosR
fcfc139ad1 Simplify quotes and apostrophes. 2014-01-23 22:27:31 +02:00
Eric Mill
1c21150fbb remove sub-licensability as a concept for public domain licenses/waivers 2013-12-17 14:24:45 -05:00
XhmikosR
366cbaf21a Work around spaces being added when copying to clipboard.
Since the license text is wrapped in `<pre>` with `white-space: pre-wrap` empty lines make the #license-text bigger than it actually is.

So, get rid of the empty newline at the end of the license text files since jekyll adds trailing spaces when it parses those.
2013-12-13 13:02:57 +02:00
Soon Van
db9bce9088 GPLv2 description could do with comma about its variants
"There are multiple variants of the
 GPL each with different requirements"

Without a comma, this passage has no break where it would
be used to add the hint of nuance between GPL versions.
2013-12-11 10:06:24 -05:00
Soon Van
6c377ddf55 No License description missing that to complete sentence 2013-12-08 20:55:23 -05:00
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
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