docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-11-06 03:38:49 +01:00
Code Issues Releases Wiki Activity
1,065 Commits 2 Branches 0 Tags 5.1 MiB
28c245adec
Commit Graph

1065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
git
78aac74fb2 Restructure individual license pages, added styles to improve alignment 2016-04-26 16:43:40 -07:00
Mike Linksvayer
213c5400bc re-add 'featured' field 
was unused for choosealicense.com display after
https://github.com/github/choosealicense.com/pull/386

but choosealicense.com is vendored into licensee which eventually
is used in GitHub; 'featured' determines what is highlighted in
license drop-down eg at https://github.com/new
 2016-04-26 12:22:15 -07:00
Mike Linksvayer
79f893e4a8 Merge pull request #397 from github/state-changes 
state changes missing from 4 licenses which have condition
 2016-04-26 04:54:31 -07:00
Mike Linksvayer
abef7e0bab state changes missing from 4 licenses which have condition 
also drop 'significant' from description, does not correspond to
any license
 2016-04-25 15:08:39 -07:00
Mike Linksvayer
c208a53107 Include 'copyleft', 'permissive', and 'public domain' in descriptions 
Feedback from @waldyrious at
https://github.com/github/choosealicense.com/pull/396#issuecomment-213912884
 2016-04-24 10:06:46 -07:00
Mike Linksvayer
699ce0f727 Merge pull request #395 from github/rm-symlinks 
rm symlinks, maybe fix #383 (Windows build)
 2016-04-24 09:29:33 -07:00
Mike Linksvayer
6e6af9b7aa min version of qtip css 2016-04-24 09:25:24 -07:00
Mike Linksvayer
7b4160681c Rework descriptions of 7 listed on /licenses 
- primarily functional
- drop self-naming
- minimize requiring significant understanding of other licenses or
  copyright
- should be excruciatingly bland for anyone who already knows the licenses
  well; newcomers shouldn't have to deal with baggage immediately

Probably a few more words should be added to the xGPLv3s about their
stronger patent terms.

Licenses not listed on /licenses could be described in similar style.
 2016-04-23 21:15:06 -07:00
Mike Linksvayer
4a27230587 skip sass bundling of qtip and normalize 2016-04-22 15:40:13 -07:00
Mike Linksvayer
57a1b07997 rm symlinks, maybe fix #383 (Windows build) 
Not certain this is right thing to do, but
https://jekyllrb.com/docs/assets/ says "Note that the sass_dir
becomes the load path for Sass imports, nothing more" so setting
it to `assets/vendor` and changing imports accordingly ought and
seems to work without disturbing other files under `assets/vendor`,
even though the docs continue "This folder should only contain
imports."
 2016-04-22 11:35:31 -07:00