docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00
Code Issues Releases Wiki Activity
1,346 Commits 3 Branches 0 Tags 5.1 MiB
Commit Graph

1346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Linksvayer
9e9f9b6166
Merge branch 'gh-pages' into home-reform 2018-06-18 07:10:43 +00:00
Mike Linksvayer
64a35c9298 lightbulb/patents->community/existing 2018-06-18 00:04:36 -07:00
Mike Linksvayer
f91ccef2fb tweak existing/community language 2018-06-18 00:01:34 -07:00
Mike Linksvayer
b9bbbe078c rollback permissive, copyleft language; community icon 2018-06-17 23:47:38 -07:00
Mike Linksvayer
fb331fd450
Merge pull request #588 from github/gnu-https 
https for fsf.org links in *GPL-3.0 licenses
 2018-06-14 23:18:50 +00:00
Mike Linksvayer
cb3a73de2a https for www.gnu.org as well 2018-06-14 15:44:52 -07:00
Mike Linksvayer
71e135627c appears opencast moved to github (bitbucket license url gets login, http://www.opencast.org/software/download points to github repo) 2018-06-14 15:36:00 -07:00
Mike Linksvayer
a625693528 https in fsf links in licenses 2018-06-14 15:29:04 -07:00
Mike Linksvayer
588b2f4a0e
Merge pull request #587 from github/https-misc 
http->https for misc links outside of license texts
 2018-05-22 13:55:52 -07:00
Mike Linksvayer
9f263936b2 http->https for misc links outside of license texts 
artistic-2.0 source changed because perlfoundation website timing out
 2018-05-22 13:39:44 -07:00
Mike Linksvayer
d247be923e
Merge pull request #563 from github/only-or-later 
*GPL -or-later and -only in sidebar instructions
 2018-04-24 16:45:58 -07:00
Mike Linksvayer
278bae2316 test handle repo name with . in it 2018-04-24 16:43:47 -07:00
Mike Linksvayer
5aa36a304d
update apache-2.0 examples to pass tests 2018-04-24 16:21:39 -07:00
Mike Linksvayer
4f16e29f16
Merge branch 'gh-pages' into only-or-later 2018-04-24 16:10:23 -07:00
Mike Linksvayer
95717830d4
Merge pull request #584 from github/cc-spdx-31 
Make CC-BY[-SA] license names match CC & SPDX license list 3.1
 2018-04-18 11:04:02 -07:00
Gram
326b883aba Actualize CC-BY licenses names 
https://creativecommons.org/licenses/by/4.0/legalcode
 2018-04-18 10:58:56 -07:00
Mike Linksvayer
d04d3f0b65
Merge pull request #582 from github/upl-c-fields 
UPL-1.0 (c) line use [year] and [fullname] fields
 2018-04-12 15:22:32 -07:00
Mike Linksvayer
b4db996481
UPL-1.0 (c) line use [year] and [fullname] fields 2018-04-12 11:30:29 -07:00
Mike Linksvayer
e67bd12e57
Merge pull request #580 from oracle/gh-pages 
Adding the Universal Permissive License 1.0.
 2018-04-12 11:26:28 -07:00
Mike Linksvayer
37429ccd9c examples should link to LICENSE files 2018-04-10 14:35:57 -07:00
Avi Miller
8d71adf6ce Merge branch 'gh-pages' of https://github.com/oracle/choosealicense.com into gh-pages 2018-04-10 13:13:42 -05:00
Avi Miller
62437700dd Updating the "using" section to list projects that are only 
licensed under the UPL, instead of being dual licensed.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2018-04-10 13:13:01 -05:00
Mike Linksvayer
4ccea129e3
use defaults 2018-04-10 10:18:43 -07:00
Avi Miller
da9fae2886 Fixed word wrap to 78 characters or less. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2018-04-10 11:27:26 -05:00
Avi Miller
119bff740a Updating upl-1.0.txt based on Travis failures. Fixing title 
attribute first to confirm I understand the failure messages.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2018-04-10 11:19:49 -05:00
Avi Miller
3ea34240f1 Adding the Universal Permissive License 1.0. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2018-04-10 09:06:28 -05:00
Mike Linksvayer
1c8e3d1439
Merge pull request #579 from wking/update-fsf-api-structure 
spec_helper: Adjust to new 'licenses' key in the FSF API
 2018-04-07 16:45:04 -07:00
W. Trevor King
24fbf6685d spec_helper: Adjust to new 'licenses' key in the FSF API 
The old root object has been moved under 'licenses' with
wking/fsf-api@8398a357 (pull: Add JSON-LD markup, 2018-01-04,
wking/fsf-api#12) for better forward/backward compatibility.
Unfortunately, this results in another one-time incompatible change,
which this commit accommodates.

The protection from future changes (which should be rare) isn't great,
because we're still parsing the document as JSON.  There is at least
one JSON-LD parser for Ruby [1], but I've stuck with vanilla JSON to
avoid pullling in an external dependency just for this rather
peripheral functionality.

[1]: https://github.com/ruby-rdf/json-ld/
 2018-04-07 16:22:44 -07:00
Mike Linksvayer
5513a3baab
Merge pull request #577 from github/rm-cla-instruction 
Remove obsolete CLA instructions
 2018-03-28 09:57:21 -07:00
Mike Linksvayer
c89376ae18
Remove obsolete CLA instructions 
Followup to #573, fixes #576
 2018-03-28 09:51:49 -07:00
Mike Linksvayer
23ecca3aca
Merge pull request #575 from github/opencop 
Rubocop 0.53 doesn't like kernel#open use more specific OpenURI.open_…
 2018-03-15 14:26:17 -07:00
Mike Linksvayer
adb35c0c82 Rubocop 0.53 doesn't like kernel#open use more specific OpenURI.open_uri instead 
841569b305/manual/cops_security.md (securityopen)

Not sure this is really a problem for tests, but easiest to just change.
 2018-03-14 18:45:10 -07:00
Mike McQuaid
91401bb18e
Merge pull request #573 from github/contributing-license 
CONTRIBUTING: note license.
 2018-02-16 09:30:57 +00:00
Mike McQuaid
a03e61a993
CONTRIBUTING: note license. 
This is to be more explicit about the contribution process and license.
 2018-02-16 09:09:15 +00:00
Mike Linksvayer
bcdc73826e
Merge branch 'gh-pages' into only-or-later 2018-01-27 15:33:16 -08:00
Mike Linksvayer
c88337772f
Merge pull request #570 from github/rusty-crates 
Update rust package license metadata link
 2018-01-11 11:21:04 -08:00
Mike Linksvayer
2b16dbd1e2
Update rust package license metadata link 
As noted by @wking at https://github.com/github/choosealicense.com/pull/563/files#r160834170
 2018-01-10 17:31:01 -08:00
Mike Linksvayer
281aa8a3d5
Merge pull request #523 from MattiSG/patch-1 
Add EUPL v1.2
 2018-01-04 14:15:40 -08:00
Mike Linksvayer
570ef6d1e0
sort examples 2018-01-04 14:07:37 -08:00
Matti Schneider
7d3a9527ec
Merge branch 'gh-pages' into patch-1 2018-01-05 10:48:39 +13:00
Matti Schneider
52a36d095f
fixup! Reference projects with unmodified license text 2018-01-05 10:43:53 +13:00
Matti Schneider
b0239b1610
Reference projects with unmodified license text 
Licensee gem requires the text to not have any prefix
 2018-01-05 10:39:25 +13:00
Matti Schneider
4863d6e863
fixup! Line wrap at 78 characters 2018-01-05 09:44:26 +13:00
Matti Schneider
372765db81
List three projects using EUPL 1.2 2018-01-04 17:59:16 +13:00
Mike Linksvayer
73e0782813
Merge pull request #566 from sdbedi/patch-1 
Update License year to 2018
 2018-01-03 12:08:04 -08:00
Mike Linksvayer
3c6df021c7
Merge branch 'gh-pages' into patch-1 2018-01-03 12:05:51 -08:00
Mike Linksvayer
80132f7359
Merge pull request #565 from github/projecturl 
project_url -> projecturl
 2018-01-03 12:05:23 -08:00
Mike Linksvayer
f9f84734ce
Merge branch 'gh-pages' into projecturl 2018-01-03 12:01:10 -08:00
Mike Linksvayer
3174c978cf
Merge pull request #567 from wking/check-approval-license-ids 
check-approval: Fix missing license_ids variable
 2018-01-03 12:00:49 -08:00
W. Trevor King
45369acf79 check-approval: Fix missing license_ids variable 
Avoid:

   $ ./script/check-approval MIT
   ./script/check-approval:55:in `<main>': undefined local variable or method `license_ids' for main:Object (NameError)

The license_ids line was added in e505eb8f (check if license is aleady
a license, 2016-01-18, #318), but license_ids was removed from the
helper in b99e7ab0 (replace 'id' variables with 'spdx_lcase' to
minimize confusion, 2016-06-01, #424).  This commit restores the old
code locally, since this script is the only consumer.
 2018-01-03 11:58:21 -08:00