Skip to content

Commit

Permalink
Merge branch 'gh-pages' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
mlinksva authored Feb 20, 2024
2 parents 6230465 + 6229c19 commit badc0d8
Show file tree
Hide file tree
Showing 52 changed files with 6,267 additions and 5,189 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true

Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
/.bundle
assets/vendor/clipboard/src
assets/vendor/clipboard/test
assets/vendor/selectivizr/tests
assets/vendor/qtip2/basic
assets/vendor/hint.css/src
/vendor
/.sass-cache
.ruby-version
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ get. But first, please make sure you understand what

Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or <https://choosealicense.com/licenses>, and there are several requirements for a license to be [cataloged](https://choosealicense.com/appendix/) on the site:

1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license).
1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://github.com/spdx/license-list-XML/blob/main/CONTRIBUTING.md).
2. The license must be listed on one of the following approved lists of licenses:
* [List of OSI approved licenses](https://opensource.org/licenses/alphabetical)
* [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*)
* [Open Definition's list of conformant licenses](https://opendefinition.org/licenses/) (non-code)
3. The license must be used in at least *1,000* public repositories. This may be documented, for example, with a [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code).
3. The license must be used in at least *1,000* public repositories. This may be documented, for example, with a [GitHub code search](https://github.com/search?q=MIT+path%3ALICENSE&type=Code).
4. 3 notable projects using the license must be identified. These must have straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/licensee/licensee) if it knew about the license.

If your proposed license meets the above criteria, here's a few other things to keep in mind as you propose the license's addition:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2013-2022 GitHub, Inc. and contributors
Copyright (c) 2013-2023 GitHub, Inc. and contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ We catalog [select](CONTRIBUTING.md#adding-a-license) open source licenses with

### Managing Dependencies

It may be the case that your system doesn't have the required dependencies. You will need `cmake` and `make` installed on your computer.
It may be the case that your system doesn't have the required dependencies. You will need `cmake` and `make` installed on your computer.

For MacOS, use Homebrew to update your dependencies (install Homebrew from <https://brew.sh/>):
```bash
Expand All @@ -29,17 +29,17 @@ sudo apt-get install make cmake

### Installing and Running the tool

Note that the third command (`./script/bootstrap`) may require you to use `sudo` access for installation. Add `sudo` right before the third command, if need be, but don't use root access.

```bash
git clone https://github.com/github/choosealicense.com.git
git clone https://github.com/github/choosealicense.com.git --recursive
cd choosealicense.com
./script/bootstrap
./script/server
```

Open `http://localhost:4000` in your favorite browser.

If you encounter any issues with the above steps, please refer to the official [Jekyll](https://jekyllrb.com/docs/) documentation and this [guide on running Jekyll as a non-superuser](https://jekyllrb.com/docs/troubleshooting/#no-sudo) for more detailed installation instructions.

## Adding a license

For information on adding a license, see [the CONTRIBUTING file](https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-a-license).
Expand Down
8 changes: 8 additions & 0 deletions _includes/css/responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
.license-body {
width: calc(100% - 250px);
}

.hint--large::after{
width: 150px;
}
}

/* iPads (portrait) ----------- */
Expand Down Expand Up @@ -162,6 +166,10 @@
.license-rules:not(.license-rules-sidebar) .license-limitations span {
background-position: -14px 0;
}

.hint--large::after{
width: 80px;
}
}

/* Smartphones (portrait) ----------- */
Expand Down
1 change: 0 additions & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

{% if page.collection == "licenses" or page.class == "license-types" %}
<script src="{{ 'assets/vendor/jquery/jquery.min.js' | relative_url }}"></script>
<script src="{{ 'assets/vendor/qtip2/jquery.qtip.min.js' | relative_url }}"></script>
<script src="{{ 'assets/vendor/clipboard/dist/clipboard.min.js' | relative_url }}"></script>
<script>
window.annotations = {{ site.data.rules | jsonify }};
Expand Down
5 changes: 0 additions & 5 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@
<html lang="en">
<head itemscope itemtype="http://schema.org/WebSite">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">

<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Chivo:900">
<link rel="stylesheet" href="{{ 'assets/css/application.css' | relative_url }}?v={{ site.github.build_revision }}">
<link rel="shortcut icon" href="{{ 'favicon.ico' | relative_url }}" type="image/x-icon">
<!--[if lt IE 9]>
<script src="/assets/vendor/html5shiv/dist/html5shiv.js"></script>
<script src="/assets/vendor/selectivizr/selectivizr.js"></script>
<![endif]-->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

{% seo %}
Expand Down
84 changes: 84 additions & 0 deletions _licenses/blueoak-1.0.0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
---
title: Blue Oak Model License 1.0.0
spdx-id: BlueOak-1.0.0

description: A permissive license whose main conditions require providing notice of the license. Contributors provide an express grant of patent rights. Licensed works, modifications, and larger works may be distributed under different terms and without source code.

how: Create a text file (typically named LICENSE.md) in the root of your source code and copy the text of the license into the file.

using:
drone-gc: https://github.com/drone/drone-gc/blob/master/LICENSE.md
oh-my-git: https://github.com/git-learning-game/oh-my-git/blob/main/LICENSE.md
punct: https://github.com/otherjoel/punct/blob/main/LICENSE.md

permissions:
- commercial-use
- modifications
- distribution
- patent-use
- private-use

conditions:
- include-copyright

limitations:
- liability
- warranty

---

# Blue Oak Model License

Version 1.0.0

## Purpose

This license gives everyone as much permission to work with
this software as possible, while protecting contributors
from liability.

## Acceptance

In order to receive this license, you must agree to its
rules. The rules of this license are both obligations
under that agreement and conditions to your license.
You must not do anything with this software that triggers
a rule that you cannot or will not follow.

## Copyright

Each contributor licenses you to do everything with this
software that would otherwise infringe that contributor's
copyright in it.

## Notices

You must ensure that everyone who gets a copy of
any part of this software from you, with or without
changes, also gets the text of this license or a link to
<https://blueoakcouncil.org/license/1.0.0>.

## Excuse

If anyone notifies you in writing that you have not
complied with [Notices](#notices), you can keep your
license by taking all practical steps to comply within 30
days after the notice. If you do not do so, your license
ends immediately.

## Patent

Each contributor licenses you to do everything with this
software that would otherwise infringe any patent claims
they can license or become able to license.

## Reliability

No contributor can revoke this license.

## No Liability

***As far as the law allows, this software comes as is,
without any warranty or condition, and no contributor
will be liable to anyone for any damages related to this
software or this license, under any kind of legal claim.***
2 changes: 1 addition & 1 deletion _licenses/cc-by-sa-4.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Creative Commons Attribution Share Alike 4.0 International
spdx-id: CC-BY-SA-4.0

description: Similar to <a href='/licenses/cc-by-4.0/'>CC-BY-4.0</a> but requires derivatives be distributed under the same or a similar, <a href="https://creativecommons.org/compatiblelicenses/">compatible</a> license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software.
description: Similar to <a href='/licenses/cc-by-4.0/'>CC-BY-4.0</a> but requires derivatives be distributed under the same or a similar, <a href="https://creativecommons.org/compatiblelicenses">compatible</a> license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software.

how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to solely supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by-sa/4.0/'>canonical URL for the license</a>.

Expand Down
2 changes: 1 addition & 1 deletion _licenses/epl-1.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: This commercially-friendly copyleft license provides the ability to
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.

using:
Eclipse hawkBit: https://github.com/eclipse/hawkbit/blob/master/LICENSE
ClojureScript: https://github.com/clojure/clojurescript/blob/master/LICENSE
JUnit: https://github.com/junit-team/junit4/blob/main/LICENSE-junit.txt
Quil: https://github.com/quil/quil/blob/master/LICENSE

Expand Down
6 changes: 3 additions & 3 deletions _licenses/epl-2.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ description: This commercially-friendly copyleft license provides the ability to
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.

using:
Eclipse SmartHome: https://github.com/eclipse/smarthome/blob/master/LICENSE
openHAB: https://github.com/openhab/openhab-distro/blob/master/LICENSE
SUMO: https://github.com/eclipse/sumo/blob/master/LICENSE
hawkBit: https://github.com/eclipse/hawkbit/blob/master/LICENSE
openHAB: https://github.com/openhab/openhab-distro/blob/main/LICENSE
SUMO: https://github.com/eclipse-sumo/sumo/blob/main/LICENSE

permissions:
- commercial-use
Expand Down
2 changes: 1 addition & 1 deletion _licenses/gpl-2.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ note: The Free Software Foundation recommends taking the additional step of addi
using:
AliSQL: https://github.com/alibaba/AliSQL/blob/master/COPYING
Discourse: https://github.com/discourse/discourse/blob/master/LICENSE.txt
Joomla!: https://github.com/joomla/joomla-cms/blob/staging/LICENSE.txt
Jellyfin: https://github.com/jellyfin/jellyfin/blob/master/LICENSE

permissions:
- commercial-use
Expand Down
4 changes: 2 additions & 2 deletions _licenses/upl-1.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
title: Universal Permissive License v1.0
spdx-id: UPL-1.0

description: A permissive, OSI and FSF approved, GPL compatible license, expressly allowing attribution with just a copyright notice and a short form link rather than the full text of the license. Includes an express grant of patent rights. Licensed works and modifications may be distributed under different terms and without source code, and the patent grant may also optionally be expanded to larger works to permit use as a contributor license agreement.
description: A permissive, OSI- and FSF-approved, GPL-compatible license, expressly allowing attribution with just a copyright notice and a short form link rather than the full text of the license. Includes an express grant of patent rights. Licensed works and modifications may be distributed under different terms and without source code, and the patent grant may also optionally be expanded to larger works to permit use as a contributor license agreement.

how: Insert the license or a link to it along with a copyright notice into your source file(s), and/or create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file, replacing [year] with the current year and [fullname] with the name (or names) of the copyright holders.

note: It is recommended to add a link to the license and copyright notice at the top of each source file, example text can be found at https://oss.oracle.com/licenses/upl/.

using:
graaljs: https://github.com/oracle/graaljs/blob/master/LICENSE
Roc: https://github.com/roc-lang/roc/blob/main/LICENSE
Skater: https://github.com/oracle/skater/blob/main/LICENSE.txt
Soufflé: https://github.com/souffle-lang/souffle/blob/master/LICENSE

permissions:
Expand Down
2 changes: 1 addition & 1 deletion appendix.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ If you're here to choose a license, **[start from the home page](/)** to see a f
{% else %}
{% assign lite = "" %}
{% endif %}
<span class="{{ r | append: lite }}">
<span class="{{ r | append: lite }}" style="margin: auto;">
<span class="license-sprite {{ r }}"></span>
</span>
</td>
Expand Down
Loading

0 comments on commit badc0d8

Please sign in to comment.