1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-06 03:38:49 +01:00
Commit Graph

1075 Commits

Author SHA1 Message Date
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
Philippe Loctaux
a84497089b Update bsd-3-clause.txt 2016-05-20 00:36:36 +02:00
Philippe Loctaux
88eab45508 Update bsd-3-clause-clear.txt 2016-05-20 00:36:21 +02:00
Mike Linksvayer
ea641ba352 slightly less tortured wording 2016-05-14 13:20:20 -07:00
Mike Linksvayer
825ea4edd3 link from table headers to legend terms 2016-05-14 13:15:56 -07:00
Mike Linksvayer
5ba84b2865 add a legend 2016-05-14 13:11:28 -07:00
Mike Linksvayer
b67f10b769 Merge pull request #409 from github/merge-patent-cols
Single patent column handles permission and limitation cases
2016-05-13 10:13:14 -07:00
Mike Linksvayer
a0dbaceec5 Single patent column handles permission and limitation cases 2016-05-10 14:59:04 -07:00
Mike Linksvayer
4d3acb603a Merge pull request #408 from github/apendix-hover
Add rule tooltips to the appendix
2016-05-10 10:46:05 -07:00
Ben Balter
3c90fe0c46 add tooltips to appendix 2016-05-10 13:43:44 -04:00
Mike Linksvayer
7ffc029d8a Merge pull request #406 from github/appendix
Appendix/table of all repo licenses; closes #388
2016-05-10 10:11:29 -07:00
Mike Linksvayer
4ad3bf98c2 Appendix/table of all repo licenses; closes #388 2016-05-09 12:12:38 -07:00
Mike Linksvayer
0b0ff8fdba Merge pull request #405 from ShaneCurcuru/patch-1
Better limitations:trademark-use
2016-05-06 09:37:48 -07:00
Shane Curcuru
00f177f856 Merge pull request #1 from ShaneCurcuru/patch-2
Match readme to actual description
2016-05-05 21:41:54 -04:00
Shane Curcuru
46270d6389 Match readme to actual description 2016-05-05 21:39:47 -04:00
Shane Curcuru
4c3818e881 Update with proposed suggestion 2016-05-05 21:38:16 -04:00
Shane Curcuru
d1ad7bd8e3 Better limitations:trademark-use
Existing phrase is likely confusing to new readers; trying to better clarify the fact that copyright licenses don't grant you trademarks anyway, but that these licenses are explicit about letting you know trademarks aren't copyrights.
2016-05-05 15:47:27 -04:00
Mike Linksvayer
76970d1170 Merge branch 'gh-pages' into functional-descriptions 2016-05-03 14:44:18 -07:00
Mike Linksvayer
d82bc65635 Merge pull request #402 from Zimmi48/gh-pages
Add more info on MPL 2.0
2016-05-03 14:43:27 -07:00
Théo Zimmermann
1f667089c7 Highlight projects with simpler licensing practices 2016-05-03 22:53:25 +02:00
Théo Zimmermann
a84fc73166 Update the link to LibreOffice license file 2016-05-03 17:52:42 +02:00
Théo Zimmermann
f915264bc8 Add examples of software under MPL
No better links found for Mozilla Firefox and Thunderbird.
2016-05-03 12:27:55 +02:00
Théo Zimmermann
7eeef34696 Add a note on the recommended boilerplate
See the recommendation of the Mozilla Foundation here: https://www.mozilla.org/en-US/MPL/2.0/FAQ/#license-use
2016-05-03 11:53:33 +02:00
Mike Linksvayer
f92e91a72d improved wording suggested by @Zimmi48 2016-05-02 10:31:59 -07:00
Mike Linksvayer
e4bbec6104 Merge pull request #400 from waldyrious/patch-1
don't use the same color for headings and links
2016-04-29 08:03:13 -07:00
Waldir Pimenta
458ef6a7b0 don't use the same color for headings and links
changed to a slightly-blue grey, which IMO fits well with the current style.
2016-04-28 17:51:16 +01:00
Mike Linksvayer
7913664645 Merge branch 'LeoFNaN-solo-license-page-355' into gh-pages 2016-04-28 09:13:29 -07:00
git
57949d33db Removed license text header 2016-04-27 15:55:34 -07:00
Leo F
f77da9af1d Merge branch 'gh-pages' into solo-license-page-355 2016-04-27 15:50:26 -07:00
Mike Linksvayer
9b41aa3353 Merge pull request #398 from github/re-featured
re-add 'featured' field
2016-04-27 12:12:06 -07:00