1.6.1 Patch update, updated copyright notice and added the license file for showndown.js.
This commit is contained in:
parent
53c51a71be
commit
87b9e1f42a
56
index.html
56
index.html
|
|
@ -6,9 +6,9 @@
|
||||||
<title>Comfitu.re</title>
|
<title>Comfitu.re</title>
|
||||||
|
|
||||||
<link href="fonts/IBM-Plex-Mono/font.css" />
|
<link href="fonts/IBM-Plex-Mono/font.css" />
|
||||||
<link href="style.css?v=1.6.0" rel="stylesheet"/>
|
<link href="style.css?v=1.6.1" rel="stylesheet"/>
|
||||||
<script src="showdown.min.js?v=2.1.0" type="application/javascript"></script>
|
<script src="vendor/showdownjs/showdown/showdown.min.js?v=2.1.0" type="application/javascript"></script>
|
||||||
<script src="script.js?v=1.6.0" type="application/javascript"></script>
|
<script src="script.js?v=1.6.1" type="application/javascript"></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
<pre style="color:#c18152;"> \___\___/_|_|_|_| |_|\__|\_,_(_)_| \___|</pre>
|
<pre style="color:#c18152;"> \___\___/_|_|_|_| |_|\__|\_,_(_)_| \___|</pre>
|
||||||
<pre> </pre>
|
<pre> </pre>
|
||||||
</div><div style="display: inline-block; height: 48px; vertical-align: bottom;">
|
</div><div style="display: inline-block; height: 48px; vertical-align: bottom;">
|
||||||
<a href="#changelog">v1.6.0</a><br/>
|
<a href="#changelog">v1.6.1</a><br/>
|
||||||
<script>comfiture.printMotd();</script><br/>
|
<script>comfiture.printMotd();</script><br/>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
|
@ -158,29 +158,59 @@
|
||||||
<div class="content-tab" id="copyright">
|
<div class="content-tab" id="copyright">
|
||||||
<h1>Copyright notice</h1>
|
<h1>Copyright notice</h1>
|
||||||
<p>
|
<p>
|
||||||
Unless otherwise specified below, the content and source code of this website are
|
This software (being this website and its contents), are licensed under the
|
||||||
licensed under the Blue Oak Model License 1.0.0.
|
Blue Oak Model License 1.0.0, except for third party works used that are not
|
||||||
A copy of this license may be viewed <a target="_blank" href="LICENSE">here</a>.
|
owned by me. These will be listed separately below under "Third party works".
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
A copy of the Blue Oak Model License may be viewed <a target="_blank" href="LICENSE">here</a>.<br/>
|
||||||
Additionally, the website source code can be viewed
|
Additionally, the website source code can be viewed
|
||||||
<a target="_blank" href="https://vcs.subcon.town/fristi/comfitu.re">here</a>.
|
<a target="_blank" href="https://vcs.subcon.town/fristi/comfitu.re">here</a>.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2>Exceptions regarding media content</h2>
|
<h2>Third party works</h2>
|
||||||
<p>
|
<p>
|
||||||
Several media used on this website, such as (but not limited to) the background images
|
This website uses the following third party works:
|
||||||
and fonts, fall under their own respective copyright licenses, and are thus not
|
</p>
|
||||||
subject to the above mentioned Blue Oak Model License.
|
|
||||||
|
<table class="link-table">
|
||||||
|
<tr>
|
||||||
|
<td>- <a href="https://www.ibm.com/plex/">IBM Plex Fonts</a> by IBM.</td>
|
||||||
|
<td><a href="./fonts/IBM-Plex-Mono/license.txt">License</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>- <a href="https://int10h.org/oldschool-pc-fonts/">Old School PC Fonts</a> by VileR.</td>
|
||||||
|
<td><a href="https://int10h.org/oldschool-pc-fonts/readme/#legal_stuff">License</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>- <a href="https://github.com/showdownjs/showdown">Showdown.js</a> for rendering markdown files.</td>
|
||||||
|
<td><a href="./vendor/showdownjs/showdown/LICENSE">License</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
- Background images and various images used in blog entries are not owned by me.
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
I do not claim any rights to these third party works.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2>Complaints</h2>
|
<h2>Complaints</h2>
|
||||||
<p>
|
<p>
|
||||||
If you feel any material is incorrectly used on this website, or otherwise
|
If you feel any material is incorrectly used on this website, or otherwise
|
||||||
infringes on your copyright, feel free to file a complaint to
|
infringes on your rights, feel free to file a complaint with
|
||||||
<a class="em" href="#">fristi「AT」subcon.town</a>.
|
<a class="em" href="#">fristi「AT」subcon.town</a>.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="content-tab" id="changelog">
|
<div class="content-tab" id="changelog">
|
||||||
<h1>Changelog</h1>
|
<h1>Changelog</h1>
|
||||||
|
<ul>
|
||||||
|
1.6.1 Patch:
|
||||||
|
<li>Updated copyright notice to provide proper attribution to third party works used on this website.</li>
|
||||||
|
<li>Added license document for showndown.js.</li>
|
||||||
|
</ul>
|
||||||
<ul>
|
<ul>
|
||||||
Blog update:
|
Blog update:
|
||||||
<li>Removed old blog posts, starting from fresh.</li>
|
<li>Removed old blog posts, starting from fresh.</li>
|
||||||
|
|
@ -282,7 +312,7 @@
|
||||||
<a href="https://fediring.net/">Fediring</a>
|
<a href="https://fediring.net/">Fediring</a>
|
||||||
<a href="https://fediring.net/next?host=comfitu.re">→</a>
|
<a href="https://fediring.net/next?host=comfitu.re">→</a>
|
||||||
</div>
|
</div>
|
||||||
<div style="text-align: right"> 2021-2022 Comfitu.re.
|
<div style="text-align: right"> © 2021-2022 comfitu.re.
|
||||||
<a href="#copyright">License</a>
|
<a href="#copyright">License</a>
|
||||||
<a target="_blank" href="https://vcs.subcon.town/fristi/comfitu.re">Source</a>
|
<a target="_blank" href="https://vcs.subcon.town/fristi/comfitu.re">Source</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
9
vendor/showdownjs/showdown/LICENSE
vendored
Normal file
9
vendor/showdownjs/showdown/LICENSE
vendored
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2018,2021 ShowdownJS
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
Loading…
Reference in a new issue