1
0
mirror of https://github.com/github/choosealicense.com synced 2024-07-01 16:13:02 +02:00
Commit Graph

1349 Commits

Author SHA1 Message Date
ale5000
91345b1b0b
Update gpl-3.0.txt 2018-06-29 18:57:00 +02:00
Mike Linksvayer
3f0d64154f
Merge pull request #592 from rishacha/feat/433-improve-page-link
Add github-edit-link to sidebar
2018-06-25 15:04:27 +00:00
Mike Linksvayer
9b378cb682 rm html comment for self-explanatory code 2018-06-25 07:40:44 -07:00
Mike Linksvayer
0af0e7cef6 rm added newlines 2018-06-25 07:39:22 -07:00
Rishabh Chakrabarti
d768b2b8df Reverted Gemfile change 2018-06-25 16:05:14 +05:30
Rishabh Chakrabarti
12e059f651 Added the Improve page link to footer 2018-06-25 04:03:01 +05:30
Rishabh Chakrabarti
8af4fb87c5 Fix Travis build failing
To fix the following offense

```sh
Offenses:
Gemfile:11:5: C: Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols. (https://github.com/rubocop-hq/ruby-style-guide#consistent-string-literals)
gem "jekyll-github-metadata"
    ^^^^^^^^^^^^^^^^^^^^^^^^
14 files inspected, 1 offense detected
```

Added comments
2018-06-25 03:47:56 +05:30
Rishabh Chakrabarti
bb8ad22c89 [feat : Issue #433 ] Added github-edit-link to sidebar
This link will direct anyone who wants to edit this page directly to the Github path which contains the file.

CHANGELOG :
1. Added the [GitHub Metadata] (http://jekyll.github.io/github-metadata/) plugin to Gemfile and Plugins
2. Added the link to the sidebar for license pages.

Github issue #433
2018-06-25 03:10:53 +05:30
Mike Linksvayer
a4311ad861
Merge pull request #590 from github/hidden-default-epl10
rm default valued metadata for one license
2018-06-22 21:01:57 +00:00
Mike Linksvayer
aa79050d00 rm default valued metadata for one license
line should've been removed rather than modified in https://github.com/github/choosealicense.com/pull/554
2018-06-22 13:40:50 -07:00
Mike Linksvayer
681fa1f90d
Merge pull request #589 from github/goals
README update on how choosealicense.com is used and what its goals are
2018-06-18 23:19:07 +00:00
Mike Linksvayer
d5750703ae
add popular qualifier
@benbalter review comment
2018-06-18 16:17:40 -07:00
Mike Linksvayer
7cb93b11d2 rm judgmental sentence 2018-06-17 16:58:36 -07:00
Mike Linksvayer
31ad0d0aa8 fix mistaken deletion, other tweaks 2018-06-17 16:56:07 -07:00
Mike Linksvayer
10170d78ed Merge branch 'gh-pages' into goals 2018-06-17 16:15: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