Skip to content

Commit df5a7eb

Browse files
AmazonPythonAmazonPython
committed
Codeigniter-Blog v2.2.2 Updated READ.md and LICENSE, added Anti 996 license.
1 parent 8c080fc commit df5a7eb

2 files changed

Lines changed: 55 additions & 6 deletions

File tree

‎LICENSE‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,51 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.
22+
23+
24+
Copyright (c) 2020 AmazonPython
25+
26+
"Anti 996" License Version 1.0 (Draft)
27+
28+
Permission is hereby granted to any individual or legal entity
29+
obtaining a copy of this licensed work (including the source code,
30+
documentation and/or related items, hereinafter collectively referred
31+
to as the "licensed work"), free of charge, to deal with the licensed
32+
work for any purpose, including without limitation, the rights to use,
33+
reproduce, modify, prepare derivative works of, distribute, publish
34+
and sublicense the licensed work, subject to the following conditions:
35+
36+
1. The individual or the legal entity must conspicuously display,
37+
without modification, this License and the notice on each redistributed
38+
or derivative copy of the Licensed Work.
39+
40+
2. The individual or the legal entity must strictly comply with all
41+
applicable laws, regulations, rules and standards of the jurisdiction
42+
relating to labor and employment where the individual is physically
43+
located or where the individual was born or naturalized; or where the
44+
legal entity is registered or is operating (whichever is stricter). In
45+
case that the jurisdiction has no such laws, regulations, rules and
46+
standards or its laws, regulations, rules and standards are
47+
unenforceable, the individual or the legal entity are required to
48+
comply with Core International Labor Standards.
49+
50+
3. The individual or the legal entity shall not induce, suggest or force
51+
its employee(s), whether full-time or part-time, or its independent
52+
contractor(s), in any methods, to agree in oral or written form, to
53+
directly or indirectly restrict, weaken or relinquish his or her
54+
rights or remedies under such laws, regulations, rules and standards
55+
relating to labor and employment as mentioned above, no matter whether
56+
such written or oral agreements are enforceable under the laws of the
57+
said jurisdiction, nor shall such individual or the legal entity
58+
limit, in any methods, the rights of its employee(s) or independent
59+
contractor(s) from reporting or complaining to the copyright holder or
60+
relevant authorities monitoring the compliance of the license about
61+
its violation(s) of the said license.
62+
63+
THE LICENSED WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
64+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
65+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
66+
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM,
67+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
68+
OTHERWISE, ARISING FROM, OUT OF OR IN ANY WAY CONNECTION WITH THE
69+
LICENSED WORK OR THE USE OR OTHER DEALINGS IN THE LICENSED WORK.

‎README.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
[**CodeIgniter-blog**](#)
1+
<a href="en">English</a> | <a href="cn">简体中文</a>[![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/license.svg" alt="License"></a>[![996.icu](https://img.shields.io/badge/link-996.icu-red.svg)](https://996.icu)
22

3-
A blog built with CodeIgniter framework, Front end template from [Duanliang blog](https://www.duanliang920.com/muban/blog/264.html), I made some changes to it.
3+
[**CodeIgniter-blog**](en)
44

5-
It can be used as a reference for a novice CodeIgniter project, including basic operations such as Create, Read, Update, Delete and Login-Registration, search.
5+
A blog built with CodeIgniter framework, Front end template from [Duanliang blog](https://www.duanliang920.com/muban/blog/264.html), I made some changes to it. The six pictures on the photo wall are from the [Concise modern magic library](http://www.nowamagic.net/librarys/).
66

7+
It can be used as a reference for a novice CodeIgniter project, including basic operations such as Create, Read, Update, Delete and Login-Registration, search as well as pagination.
78

8-
**[CodeIgniter博客](#)**
9+
**[CodeIgniter博客](cn)**
910

10-
一个使用CodeIgniter框架构建的博客，前端模板来自[段亮博客](https://www.duanliang920.com/muban/blog/264.html)，我对它进行了一些修改。
11+
一个使用CodeIgniter框架构建的博客，前端模板来自[段亮博客](https://www.duanliang920.com/muban/blog/264.html)，我对它进行了一些修改。照片墙上的六张图片来自[简明现代魔法图书馆](http://www.nowamagic.net/librarys/)。
1112

12-
它可以作为新手CodeIgniter项目的参考，包括增、删、改、查等基本操作和登录注册、搜索等功能。
13+
它可以作为新手CodeIgniter项目的参考，包括增、删、改、查等基本操作和登录注册、搜索以及分页等功能。

0 commit comments

Comments
 (0)