Mike Linksvayer
08cf5180ce
Merge pull request #338 from github/revert-337-update-fields-descriptions
...
Revert "Update descriptions of fields to reflect hidden default change"
2016-02-02 14:47:51 -08:00
Mike Linksvayer
8c8698f1f5
Revert "Update descriptions of fields to reflect hidden default change"
2016-02-02 14:45:56 -08:00
Mike Linksvayer
74c47615e8
Merge pull request #337 from github/update-fields-descriptions
...
Update descriptions of fields to reflect hidden default change
2016-02-02 14:31:58 -08:00
Mike Linksvayer
86645a03b3
Update descriptions of fields to reflect hidden default change,
...
info provided in
https://github.com/github/choosealicense.com/issues/290#issuecomment-138722623
2016-02-02 13:45:39 -08:00
Brandon Keepers
64c286edd2
Merge pull request #336 from github/new-examples
...
Update example projects
2016-02-01 19:52:04 +01:00
Brandon Keepers
6da34f0825
Use Android instead of Docker
...
Reasoning: it is a mass consumer brand that is likely to be better known than Apache
2016-02-01 19:48:02 +01:00
Brandon Keepers
3227e22d89
Revert changes to GPL text
...
This should be iterated on in another PR
2016-02-01 19:45:01 +01:00
Mike Linksvayer
17fa055cf6
Merge pull request #334 from github/gplv3-no-sublicense
...
Remove confusing and inaccurate [no-]sublicensing property
2016-02-01 09:45:34 -08:00
Mike Linksvayer
440b44b5f4
remove all attempt to describe sublicensing permission/prohibitions
2016-01-31 14:56:40 -08:00
Mike Linksvayer
53cf00a11f
Merge pull request #333 from github/artistic2-copyright
...
Artistic License 2.0 (c) is for license text, not a template
2016-01-31 13:00:10 -08:00
Brandon Keepers
abe74941dc
Update examples
...
- add a 3rd example (.NET Core) for MIT
- replace SVN & NuGet with more more modern and well-known examples
(Swift, Docker) for Apache:
- Add a GPLv3 project to examples.
2016-01-31 19:54:59 +01:00
Brandon Keepers
ba251b175a
Revert "Update examples"
...
This reverts commit 49cf1471f7
.
2016-01-31 19:54:01 +01:00
Brandon Keepers
49cf1471f7
Update examples
...
- add a 3rd example (.NET Core) for MIT
- replace SVN & NuGet with more more modern and well-known examples
(Swift, Docker) for Apache:
- Add a GPLv3 project to examples.
2016-01-31 19:53:09 +01:00
Mike Linksvayer
8522819681
GPLv3 doesn't allow sublicensing, just as AGPLv3 and GPLv2 don't
...
LGPLv3 doesn't allow sublicensing, justg as LGPLv2 doesn't as
former is additional permissions for GPLv3 and these don't include
sublicensing
2016-01-30 10:16:23 -08:00
Mike Linksvayer
8ed37bc56a
Artistic License 2.0 (c) is for license text, not a template
...
fix #310 introduced in 0161a3d75d
2016-01-30 10:06:05 -08:00
Mike Linksvayer
9dbc5190de
Merge pull request #332 from pra85/patch-1
...
Typo fix in CONTRIBUTING.md
2016-01-30 09:46:33 -08:00
Prayag Verma
3f6cdaa625
Typo fix in CONTRIBUTING.md
2016-01-30 10:13:53 +05:30
Mike Linksvayer
cee7569a91
Merge pull request #330 from github/bom-test
...
Test each license file does not begin with byte order mark
2016-01-29 09:56:45 -08:00
Ben Balter
41a9f1a9d7
use regex to check for BOM
2016-01-29 12:44:28 -05:00
Ben Balter
b9cdd8cb08
Merge branch 'gh-pages' into bom-test
2016-01-29 12:27:18 -05:00
Mike Linksvayer
d1d7f30b77
Merge pull request #329 from github/no-license-cleanup
...
skipping no-license no longer pertinent as no-license is no-more
2016-01-28 17:33:38 -08:00
Mike Linksvayer
6854e8aa86
Test each license file does not begin with byte order mark
...
Fixes #328
2016-01-28 17:19:42 -08:00
Mike Linksvayer
0fdcb2ca24
skipping no-license no longer pertinent as no-license is no-more
2016-01-28 15:11:42 -08:00
Mike Linksvayer
45c02a892c
Merge pull request #325 from github/spdx-name-hint
...
Make it clear in the CONTRIBUTING instructions that the license file name should be the SPDX ID
2016-01-28 14:15:12 -08:00
Mike Linksvayer
72cd65abea
Merge pull request #326 from github/no-license
...
consolidate no license info in /no-license, remove from /licenses
2016-01-28 14:01:51 -08:00
Mike Linksvayer
65b74c5612
Merge pull request #319 from sieversMartin/gh-pages
...
Added license lppl-1-3c.txt
2016-01-28 13:07:19 -08:00
sieversMartin
53324d96cd
Merge branch 'gh-pages' into gh-pages
2016-01-28 21:56:33 +01:00
Mike Linksvayer
f99821523d
Merge pull request #327 from github/eupl-render
...
remove BOM from eupl-1.1.txt which caused it to not render
2016-01-28 12:14:07 -08:00
Mike Linksvayer
96fc8b143e
tell html-proofer to check http://choosealicense.com links locally
...
rather than externally
2016-01-28 11:58:58 -08:00
Mike Linksvayer
7959b9aca4
remove BOM from eupl-1.1.txt which caused it to not render
2016-01-28 09:23:53 -08:00
Mike Linksvayer
2e261d4530
Merge pull request #320 from EmidioStani/gh-pages
...
added eupl-1.1.txt licence
2016-01-28 09:07:52 -08:00
emidiostani
aa28e590b6
Merge branch 'gh-pages' of https://github.com/EmidioStani/choosealicense.com into gh-pages
2016-01-28 09:11:30 +01:00
emidiostani
c27b9cd238
fixed comment https://github.com/github/choosealicense.com/pull/320
2016-01-28 09:10:03 +01:00
Mike Linksvayer
72f852f4eb
slim down no license copyright holder info, add section for users
2016-01-27 11:44:30 -08:00
Emidio
ec929eb17d
Merge branch 'gh-pages' into gh-pages
2016-01-27 09:55:26 +01:00
emidiostani
354ff80904
fixed errors described in https://github.com/github/choosealicense.com/pull/320
2016-01-27 09:53:04 +01:00
Mike Linksvayer
e98ec06a7d
consolidate no license info in /no-license, remove from /licenses
...
fixes #196
2016-01-26 13:42:29 -08:00
Mike Linksvayer
d5c23e2871
spel & mention lowercase spdx id w/example
2016-01-25 09:53:33 -08:00
martinsievers
749ea304e9
Removed "sub-license" and "patent-use" as suggested in comments on Github
2016-01-21 17:03:37 +01:00
sieversMartin
47a7dc9ffb
Merge branch 'gh-pages' into gh-pages
2016-01-21 17:00:17 +01:00
Ben Balter
78aa0e14c6
Merge pull request #324 from github/hidden-by-default
...
Make licenses hidden by default
2016-01-20 12:24:18 -05:00
Ben Balter
fbef68f89b
make it clear that license should be the spdx id
2016-01-20 10:43:57 -05:00
Ben Balter
ad1c2d9684
Catch invalid SPDX IDs when looking for the SPPX name, fixes #322
2016-01-20 10:42:36 -05:00
Ben Balter
ed908356e7
make licenses hidden by default
2016-01-20 10:37:44 -05:00
Ben Balter
5531742d10
better error output
2016-01-20 10:20:04 -05:00
martinsievers
53ff2a8686
Added a note and removed redirect again
2016-01-20 14:37:49 +01:00
martinsievers
57aa0e3764
Removed redirect attribute
2016-01-20 09:38:07 +01:00
martinsievers
e6f445f12b
Renamed to pass cibuild
2016-01-20 09:36:02 +01:00
martinsievers
91e45575f0
Added fields
2016-01-19 17:54:36 +01:00
martinsievers
1dbf74ffc7
Added a nickname
...
Removed redirect
2016-01-19 17:51:08 +01:00