Commit Graph

725 Commits

Author SHA1 Message Date
943b2f6035 A New license drafted by Katt Gu & Suji Yan
This version of 996 License is drafted by [Katt Gu, J.D, University of Illinois, College of Law](https://scholar.google.com.sg/citations?user=PTcpQwcAAAAJ&hl=en&oi=ao); advised by [Suji Yan](https://www.linkedin.com/in/tedkoyan/), CEO of [Dimension](https://www.dimension.im).

This draft is adapted from the MIT license. For more detailed explaination, please see [Wiki](https://github.com/kattgu7/996-License-Draft/wiki). This license is designed to be compatible with all major open source licenses. 

Since the working hour limit is almost included in the labor law of every country, it is better just saying compliance with labor law rather then saying the hours, cuz I believe what those companies do is more than force their employees to work overnight. For countries with no labor law or where the labor law is not enforceable (like most authoritarian countries), core international labor standards is the internationally agreed minimum standards.

For more details about International Labor Law, please check [International Labour Orginazation](ilo.org) and [The WTO and International Labour Organization](https://www.wto.org/english/thewto_e/coher_e/wto_ilo_e.htm).

For law professionals or anyone who are willing to contribute to further version directly, please go to [996-License-Draft](https://github.com/kattgu7/996-License-Draft). Thank you.
2019-03-31 09:13:52 +08:00
7b5aa09218 Merge pull request #24740 from kowito/patch-1
Fixed type. in Thai language
2019-03-31 00:54:52 +08:00
040321cae1 Fixed type. 2019-03-30 23:38:46 +07:00
a5470d8f34 Update blacklist.md 2019-03-30 20:39:14 +08:00
93ab4a558d Merge pull request #24729 from XUJINKAI/patch-1
readme添加badge
2019-03-30 20:34:13 +08:00
XJK
5a97587956 Update README.md 2019-03-30 20:19:17 +08:00
b1d37ec7f7 Merge pull request #24728 from bofeiw/master
[update README] Move badge to "what can I do"
2019-03-30 20:00:27 +08:00
26176bc53c [update README] Move badge to "what can I do"
加徽章应该属于what can i do,建议修改,同时加入中文版的加徽章
2019-03-30 22:50:49 +11:00
c82ac0b497 Merge pull request #24727 from bofeiw/master
[update] 黑名单 链接名称改为文章标题
2019-03-30 19:27:33 +08:00
287890882e [update] 黑名单 链接名称改为文章标题
有标题的换成标题了,更易读
2019-03-30 22:19:33 +11:00
13a97d27e7 Update README.md 2019-03-30 19:17:59 +08:00
bcb2258fd6 Merge pull request #24725 from hezhao1016/master
添加黑名单 > 跨越速运 大小周 裁员
2019-03-30 19:17:11 +08:00
a811d2dfe7 Update blacklist.md 2019-03-30 19:12:46 +08:00
20e569043d Update blacklist.md 2019-03-30 19:12:18 +08:00
a92672a8d7 添加黑名单 > 跨越速运 大小周 裁员 2019-03-30 18:38:44 +08:00
17a4305c0e 添加黑名单 > 跨越速运 大小周 裁员 2019-03-30 18:34:18 +08:00
838196d40c Merge pull request #24716 from uDp30Z4w/patch-6
Update blacklist.md
2019-03-30 18:23:23 +08:00
8c2b0908ad Merge pull request #24717 from dolsup/patch-1
Update i18n.md
2019-03-30 18:22:18 +08:00
93353ff3a3 Merge pull request #24720 from xingfanxia/master
Fix english translation
2019-03-30 18:20:26 +08:00
09993f515e fix english translation 2019-03-30 02:50:11 -07:00
a1782b0594 Merge branch '996icu-master' 2019-03-30 02:43:01 -07:00
a21ec12506 dl file 2019-03-30 02:42:47 -07:00
4ca7db4632 Update i18n.md
update the link for Korean to new file
2019-03-30 18:11:04 +09:00
c6c82b240e Update blacklist.md 2019-03-30 16:50:18 +08:00
e9bee33dae Merge pull request #24706 from Great-Li-Xin/patch-1
Update en_US.md
2019-03-30 16:17:30 +08:00
06e0e263b2 Merge pull request #24711 from njzjz/patch-3
modify HTML style to Markdown style
2019-03-30 16:06:54 +08:00
7be0dce506 Merge pull request #24710 from dolsup/master
fix Korean translation
2019-03-30 16:01:25 +08:00
133a7b9ef7 modify HTML style to Markdown style 2019-03-30 16:00:41 +08:00
283616fc0c Merge pull request #24707 from njzjz/patch-1
Avoid linking to 996 website
2019-03-30 15:52:30 +08:00
d0c2bf7771 fix Korean translation 2019-03-30 16:36:25 +09:00
12aac1d687 Avoid linking to 996 website 2019-03-30 15:32:24 +08:00
0036698bd9 Update en_US.md
修正语法错误与调整用词。
Grammatical corrections and word adjustments.
2019-03-30 15:29:54 +08:00
57641160de Merge pull request #24675 from fengT-T/patch-1
add 996.LIST
2019-03-30 14:32:55 +08:00
96b168b8ed Merge pull request #24702 from bofeiw/master
readme增加license描述
2019-03-30 14:28:11 +08:00
ed799d6cfb Merge pull request #24701 from Simon-Leung/Simon-Leung-patch-zh_lzh-hans
修复 zh-lzh-Hans.md 语法问题
2019-03-30 14:20:18 +08:00
d8bc5a6461 Merge pull request #24699 from YixinChenn/patch-1
Update blacklist.md
2019-03-30 14:20:10 +08:00
360a137664 Merge pull request #24694 from stevenlei/master
add cantonese translation
2019-03-30 14:18:53 +08:00
6276d3ded1 Merge pull request #24693 from iamybj/patch-4
更新证据材料
2019-03-30 14:18:19 +08:00
64d43e991a Merge pull request #24692 from Roy-Mao/review_jp_readme
Review和更新日文readme
2019-03-30 14:17:42 +08:00
121700fab7 readme增加license描述 2019-03-30 17:15:32 +11:00
8b99201ce3 Merge pull request #24631 from HenryQW/master
增加部分法规英文及排版,增加已上市 996 公司股票代码
2019-03-30 14:09:36 +08:00
1468ff78ec Renamed to zh-Hans.md 2019-03-30 14:09:17 +08:00
8b42434a63 Update README.md 2019-03-30 14:07:50 +08:00
ed499d0f85 Update zh-lzh-Hans.md
修复语法问题
2019-03-30 14:05:31 +08:00
89c54f0312 Merge pull request #24700 from bofeiw/master
修复996 badge链接
2019-03-30 14:05:12 +08:00
45407a8d9c Merge pull request #2 from 996icu/master
sync
2019-03-30 14:03:55 +08:00
e711d185af Merge pull request #24627 from uDp30Z4w/patch-8
Remind of blind digital watermarking
2019-03-30 14:01:00 +08:00
4b278ef00d 修复996 badge链接
原链接502,换到新链接
2019-03-30 16:55:11 +11:00
1e1eb8ed8d Update blacklist.md 2019-03-30 13:53:01 +08:00
2277a73a73 Merge pull request #24591 from liuchuzhang/patch-1
Format Chinese
2019-03-30 13:51:06 +08:00