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
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
Mike Linksvayer
7f8aad4532 Merge pull request #394 from github/existing
when contributing existing projects and commmunities
2016-04-21 20:23:07 -07:00
Mike Linksvayer
a5f28da4fd missing leading / on permalink 2016-04-20 21:18:03 -07:00
Mike Linksvayer
8dbeb10909 spel 2016-04-18 21:57:56 -07:00
Mike Linksvayer
2b35c5b03e when contributing existing projects and commmunities
page covering licensing for this situation

- not linked anywhere yet
- partially addresses #239
- tangentially addresses #242, could be extended to address including
  code from other projects more explicitly
- with some additional work (feedback wanted) could be useful to link
  as another "situation" from the home page
2016-04-18 21:54:10 -07:00
Mike Linksvayer
355876520d Merge pull request #393 from github/cleanup-361-386
cleanup variant/family/fields forgotten in #361 and #386
2016-04-17 12:11:29 -07:00
Mike Linksvayer
968692d18c rm instruction not pertinent since #324 2016-04-16 10:22:51 -07:00
Mike Linksvayer
1aef5cd845 rm no longer needed navpill css, forgotten in #386 2016-04-16 10:16:40 -07:00
Mike Linksvayer
7b7ae82141 family->overview css, forgotten in #386 2016-04-16 10:13:49 -07:00
Mike Linksvayer
5052d34b11 rm support for variant display, forgotten in #386 2016-04-16 10:07:30 -07:00
Mike Linksvayer
32219ad267 tooltip update missed in #361 2016-04-16 09:58:54 -07:00
Mike Linksvayer
045d0d0dea Merge pull request #392 from github/gplv2-patent
rm patent-use permission field from GPLv2 and LGPLv2.1 metadata
2016-04-13 20:45:03 -07:00
Mike Linksvayer
8be0e5f8c2 rm patent-use permission field from GPLv2 and LGPLv2.1 metadata
There's a strong argument they have implied patent licenses, but
this site doesn't annotate any other implied patent licenses, as
one would expect given the description of the patent-use field "This
license provides an express grant of patent rights from the contributor
to the recipient."
2016-04-12 20:09:48 -07:00
Mike Linksvayer
a4e247a156 Merge pull request #391 from github/rename
rm 'rename' field; never used to describe any license
2016-04-12 17:23:29 -07:00
Mike Linksvayer
6cfa3c1c13 Merge branch 'gh-pages' into rename 2016-04-12 17:21:56 -07:00
Mike Linksvayer
e5a92ccb50 rm 'rename' field; never used to describe any license
Searched with `git log -Srename`

Arguably *could* be used to describe ofl-1.1 or artistic-2.0, but
renaming is an option for licensors to include in ofl-1.1 and one
of a few ways to comply with artistic-2.0. Doesn't seem straightforward
or common enough to catalog here.
2016-04-11 17:07:11 -07:00
Mike Linksvayer
b41a99eaa0 Merge pull request #390 from IanLee1521/patch-1
Fixed bug with include when using.size == 1
2016-04-10 10:38:07 -07:00
Ian Lee
ff122da796 Add 's' when only a single license
When `using.size` == 1, add an 's' to the using sentence.
2016-04-09 15:24:15 -07:00
Ian Lee
4a39b82795 Fixed bug with include when using.size == 1
If using.size is 1, then the resulting html would be "and PROJECT use the ..." without anything being listed before the "and".
2016-04-09 15:20:13 -07:00
Mike Linksvayer
c3e53e968d Merge pull request #386 from github/spectrum
replace /licenses listings with spectrum
2016-04-09 08:37:21 -07:00
Mike Linksvayer
084b167ae0 missed hidden field in README 2016-04-07 19:09:25 -07:00
Mike Linksvayer
b4cf070a82 rm no longer pertinent fields and tests 2016-04-07 18:48:15 -07:00
Mike Linksvayer
baddd740af remove family display elements, add spectrum explanation 2016-04-07 17:49:56 -07:00
Mike Linksvayer
5e41181f25 replace /licenses listings with spectrum
(on home page, non-hidden) -> (agplv3 to unlicense)

no explanation or cruft removal done yet
2016-04-07 16:08:58 -07:00
Mike Linksvayer
01b29bfd60 Merge pull request #385 from github/LeoFNaN-patch-1
add nickname and desc to sidebar, cleanup
2016-04-04 22:47:10 -07:00
Mike Linksvayer
cb41d7154a remove unnecessary css that made sidebar spacing irregular 2016-04-04 11:07:12 -07:00
Mike Linksvayer
850a5c2b06 make lonely h5 a h3 https://github.com/github/choosealicense.com/pull/382#issuecomment-204634348 2016-04-04 10:58:44 -07:00
Mike Linksvayer
922d4d3f79 add missing descriptions, missing property, slight desc tweaks 2016-04-04 10:56:29 -07:00
Mike Linksvayer
23db2665fe Merge branch 'gh-pages' into LeoFNaN-patch-1 2016-04-04 10:26:16 -07:00
Mike Linksvayer
3c30309948 Merge pull request #384 from github/oafsl
AFL and OSL corrections
2016-04-03 10:08:34 -07:00
Mike Linksvayer
9a5192cb21 AFL and OSL corrections 2016-04-02 17:54:21 -07:00
Leo F
bfd43e2d04 Display description and nickname in sidebar (#355)
Added if for nickname since some of the licenses may not have a nickname.
2016-04-01 19:17:56 -07:00
Mike Linksvayer
bfb9e249c5 Merge pull request #378 from waldyrious/patch-1
Add list of projects using ISC (closes #377)
2016-03-28 23:30:35 -07:00
Waldir Pimenta
7c2763b747 Add list of projects using ISC (closes #377) 2016-03-28 19:06:40 +01:00
Mike Linksvayer
0d44d4c30d Merge pull request #376 from github/addled-resources
Edit 'additional resources' on about page
2016-03-27 18:24:09 -07:00
Mike Linksvayer
1d455fb37e rm tools section
first 3 narrow / exper tools
addalicense.com is very relevant but seems unreliable, aim to bring back
2016-03-26 14:01:20 -07:00
Mike Linksvayer
d96830d586 Edit 'additional resources' on about page
- add FSF list
- slight rewording, eg OSI list not exactly comprehensive
- add Cowan wizard
- rm TLDRLegal; can't seem to keep junk/spam additions off its home page
2016-03-26 12:26:56 -07:00
Mike Linksvayer
6f817fed74 Merge pull request #373 from github/adius-patch-1
consistent self-id of bsd-2/3, mit following isc in #371
2016-03-19 10:17:23 -07:00
Mike Linksvayer
1f4bd4e8c5 Merge branch 'gh-pages' into adius-patch-1 2016-03-19 10:15:18 -07:00
Mike Linksvayer
a3ec95b539 Merge pull request #374 from github/html-proofer-3.0
upgrade to html-proofer 3
2016-03-18 08:59:13 -07:00
Mike Linksvayer
98355c7571 upgrade to html-proofer 3 2016-03-17 17:30:47 -07:00