Merge branch 'master' into master

LICENSE

@@ -1,15 +1,46 @@
 Copyright (c) <year> <copyright holders>
- 
+
 996 License Version 1.0 (Draft)
-
-Permission is hereby granted to any individual or legal entity obtaining a copy of this licensed work (including the source code, documentation and/or related items, hereinafter collectively referred to as the "licensed work"), free of charge, to deal with the licensed work for any purpose, including without limitation, the rights to use, reproduce, prepare derivative works of,  distribute and sublicense the licensed work, subject to the following conditions:
-
-1. The individual or the legal entity must conspicuously display, without modification, this License on each redistributed or derivative copy of the Licensed Work.
 
-2. The individual or the legal entity must strictly comply with all applicable laws, regulations, rules and standards of the jurisdiction relating to labor and employment where the individual is physically located or where the individual was born or naturalized; or where the legal entity is registered or is operating (whichever is stricter). In case that the jurisdiction has no such laws, regulations, rules and standards or its laws, regulations, rules and standards are unenforceable, the individual or the legal entity are required to comply with Core International Labor Standards.
+Permission is hereby granted to any individual or legal entity
+obtaining a copy of this licensed work (including the source code,
+documentation and/or related items, hereinafter collectively referred
+to as the "licensed work"), free of charge, to deal with the licensed
+work for any purpose, including without limitation, the rights to use,
+reproduce, prepare derivative works of, distribute and sublicense the
+licensed work, subject to the following conditions:
+
+1. The individual or the legal entity must conspicuously display,
+without modification, this License on each redistributed or derivative
+copy of the Licensed Work.
+
+2. The individual or the legal entity must strictly comply with all
+applicable laws, regulations, rules and standards of the jurisdiction
+relating to labor and employment where the individual is physically
+located or where the individual was born or naturalized; or where the
+legal entity is registered or is operating (whichever is stricter). In
+case that the jurisdiction has no such laws, regulations, rules and
+standards or its laws, regulations, rules and standards are
+unenforceable, the individual or the legal entity are required to
+comply with Core International Labor Standards.
 
-3. The individual or the legal entity shall not induce or force its employee(s), whether full-time or part-time, or its independent contractor(s), in any methods, to agree in oral or written form, to directly or indirectly restrict, weaken or relinquish his or her rights or remedies under such laws, regulations, rules and standards relating to labor and employment as mentioned above, no matter whether such written or oral agreement are enforceable under the laws of the said jurisdiction, nor shall such individual or the legal entity limit, in any methods, the rights of its employee(s) or independent contractor(s) from reporting or complaining to the copyright holder or relevant authorities monitoring the compliance of the license about its violation(s) of the said license.
-
-THE LICENSED WORK 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 COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ANY WAY CONNECTION WITH THE LICENSED WORK OR THE USE OR OTHER DEALINGS IN THE LICENSED WORK.
-
+3. The individual or the legal entity shall not induce or force its
+employee(s), whether full-time or part-time, or its independent
+contractor(s), in any methods, to agree in oral or written form, to
+directly or indirectly restrict, weaken or relinquish his or her
+rights or remedies under such laws, regulations, rules and standards
+relating to labor and employment as mentioned above, no matter whether
+such written or oral agreement are enforceable under the laws of the
+said jurisdiction, nor shall such individual or the legal entity
+limit, in any methods, the rights of its employee(s) or independent
+contractor(s) from reporting or complaining to the copyright holder or
+relevant authorities monitoring the compliance of the license about
+its violation(s) of the said license.
 
+THE LICENSED WORK 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 COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN ANY WAY CONNECTION WITH THE
+LICENSED WORK OR THE USE OR OTHER DEALINGS IN THE LICENSED WORK.

README.md

@@ -13,7 +13,7 @@ Repo for counting stars and contributing. Press <kbd>F</kbd> to pay your respect
 
 What is 996?
 ---
-A "996" work schedule refers to an unofficial work schedule (9 a.m. ~ 9 p.m., 6 days per week) that has been gaining in popularity. Serving a company that encourages the "996" work schedule usually means working for at least 60 hours a week.
+A "996" work schedule refers to an unofficial work schedule (9 a.m. ~ 9 p.m., 6 days per week) that has been gaining in popularity. Serving a company that encourages the "996" work schedule usually means working for at least 60 hours per week.
 
 What can I do?
 ---
@@ -26,29 +26,27 @@ What can I do?
 
 The principle and purpose Of this repository!
 ---
+* 996.ICU is an initiative initiated by IT practitioners. We welcome people from other fields and other countries to join the discussion.
 
 * This is not a political movement. We firmly uphold the labor law and require employers to respect the legitimate rights and interests of their employees.
 
 * It is a great progress from closed source to open source, and it will also be a great progress from open source to emphasize labor rights at the same time. What we want is to create an open source software license that advocates for workers' rights.
 
 * We are willing to hear all positive and constructive proposals and advocate for mature and responsible speech.
-
-* 996.ICU is an initiative of IT practitioners and we welcome people from other fields and countries to join the discussion.
-
-* At present, the 996ICU License is not very mature. I hope professionals with relevant experience can offer some help.
+
+* We are working on the drafting of 996 License right now and we hope to get help from professionals with relevant experience.
 
 *****
 
-* 这并不是一个政治运动，我们坚定维护劳动法，我们要求雇主尊重雇员的合法权益
+* 996.ICU 是IT从业者发起的一项倡议，我们欢迎其他领域、其他国家的人士加入讨论。
 
-* 从闭源到开源是一次伟大的进步，从开源到同时强调保护劳工权益也将是一次伟大的进步，我们想要创造一个主张保护劳动者权益的开源软件许可证
-
-* 我们欢迎一切积极的、具有建设性意义的建议，倡导成熟的、负责任的发言
-
-* 996.ICU 是IT从业者发起的一项倡议，我们欢迎其他领域、其他国家的人士加入讨论
+* 这并不是一个政治运动，我们坚定维护劳动法，我们要求雇主尊重雇员的合法权益。
 
-* 目前 996ICU License 是不成熟的，希望能有相关经验的专业人士能给予帮助
-
+* 从闭源到开源是一次伟大的进步，从开源到同时强调保护劳工权益也将是一次伟大的进步，我们想要创造一个主张保护劳动者权益的开源软件许可证。
+
+* 我们欢迎一切积极的、具有建设性意义的建议，倡导成熟的、负责任的发言。
+
+* 目前 996ICU License 处于起草阶段，希望有相关经验的专业人士能给予帮助。
 
 Expand influence
 ---
@@ -63,20 +61,24 @@ Community powers
 
  - [996.TSC](https://github.com/lxlxw/996.TSC) is a repo designed to let more people know and join the activity of 996.ICU.
 
- - An [anonymous vote page](externals/exposure.md) shows a rank list of 996 (or more) companies. (Thanks to @LinXueyuanStdio)
-
  - [996.LIST](https://github.com/fengT-T/996_list) is a repo of a rank list of 996 companies and 955 companies.
 
 Where are the issues?
 ---
 Even with interaction limits on, the issue area was totally out of control.  
 So I **personally** decided to switch it off, not by GitHub or others.
 
-The 996ICU License
+License
 ---
 [996ICU License](LICENSE)  
 
- - The purpose of this license is to prevent 996-style companies from using the software or codes under the license, and force those companies to balance their work schedule.
- - It is an idea of @xushunke: **Design A Software License Of Labor Protection -- 996ICU License**  
- - Its source is from @Artoria2e5. See [#15642](https://github.com/996icu/996.ICU/pull/15642) for more details.  
- - This license should be used with other licenses as a practice of multi-licensing.
+ - The purpose of this license is to prevent anti-labour-law companies from using the software or codes under the license, and force those companies to balance their work schedule.
+ - It is an idea of @xushunke: **Design A Software License Of Labor Protection -- 996ICU License**. See [#15642](https://github.com/996icu/996.ICU/pull/15642) for more details.  
+> 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.
+> 
+> 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.
+
+
+

blacklist/blacklist.md

@@ -1,14 +1,14 @@
-996（或其他异常工时制度）公司名单
+996（或其他违法加班制度）公司名单
 ===
-异常工时制度是指明显违背劳动法的公司规定的制度。
+违法加班制度是指有证据证明的违反相关法律法规及劳动合同，未经与工会和劳动者协商，或超时延长工作时间（每日超过三小时或每月超过三十六小时），或未足额支付加班加点工资报酬的非法制度。
 
 贡献指南
 ---
 更新此文件时，请简要描述内容，比如“北京XX公司”。  
 并提供确切的证据：
-- 外部证据：比如官方公告，新闻链接，招聘网站官方描述等
+- 外部证据（包括但不限于官方公告、新闻链接、招聘网站官方描述等）
   - 可直接粘贴链接
-- 内部证据：比如内部论坛，内部邮件，打卡记录，调休记录等
+- 内部证据（包括但不限于内部论坛、内部邮件、打卡记录、调休记录等）
   - 可粘贴截图链接
   - 如果您不想在证据内容处填写截图链接，可在PR描述中附带截图
 
@@ -21,14 +21,14 @@
 - 本仓库只在筛选出符合上述要求的PR后，在本页面作出展示。
 - 信息由众人贡献，真伪请自行判断。
 - 信息可能存在时效性，也请参考其他来源的信息。
-- 同公司不同部门规定有可能不同，公司名称不代表该公司全部存在该情况，仅提供参考。
-- 如果您认为您的公司不在此列，请提PR说明情况，核实后将会删除。
-- 如果您的公司存在被抹黑的情况，也请提PR说明情况，核实后将会删除。
+- 同公司不同部门规定有可能不同，公司名称不代表该公司全部存在该情况，仅供参考。
+- 如果您认为您的公司不在此列或存在被抹黑的情况，请提PR说明情况，核实后将会删除。
+
 
 名单列表
 ---
 |城市|公司|曝光时间|制度描述|证据内容|
-|:---|:---|:---|:---|:---:|
+|:---:|:---:|:---:|:---:|:---:|
 |北京|[58同城](https://www.58.com)|2016年9月|996|[58同城实行全员996工作制 被指意图逼员工主动辞职](http://finance.cnr.cn/gs/20160901/t20160901_523105136.shtml)|
 |杭州|[有赞](https://www.youzan.com)|2019年1月|996|[年会成了“鸿门宴”，这家公司“强制996”被员工举报](http://www.linkshop.com.cn/web/archives/2019/418163.shtml)|
 |北京|[京东](https://www.jd.com)|2019年3月|995|[京东回应995工作制：不会强制要求 但要全情投入.](http://tech.163.com/19/0312/13/EA2QGIOK00097U7R.html)|
@@ -39,8 +39,14 @@
 |北京|[字节跳动](https://bytedance.com)|2017年7月|加班|[看准](https://www.kanzhun.com/gsr5622411tl56.html)、[搜狐](https://www.sohu.com/a/256795805_231667)|
 |南京|[苏宁](http://www.suning.com)|2019年3月|996|[如何评价今年苏宁正式实行996工作制?](https://www.zhihu.com/question/314152843/answer/613149536)|
 |深圳|[深信服](http://www.sangfor.com.cn)|2019年3月|9106|[深信服真的每天加班到 11 点吗](https://www.v2ex.com/t/525495)|
-|深圳|[华为](https://www.huawei.com/cn/)|2016年8月|9106|[华为：“自愿”的奋斗者协议](http://focus.news.163.com/10/0921/15/6H460OOP00011SM9.html)|
-|广州|[鲸鱼游戏]()|2017年3月|996|[考勤](https://raw.githubusercontent.com/xuhaodong/img/master/196803444329033095.jpg)|
+|深圳|[华为](https://www.huawei.com/cn/)|2010年8月|9106|[华为：“自愿”的奋斗者协议](http://focus.news.163.com/10/0921/15/6H460OOP00011SM9.html)|
+|广州|[鲸鱼游戏](http://www.adjingyu.com/)|2017年3月|996|[考勤](https://raw.githubusercontent.com/xuhaodong/img/master/196803444329033095.jpg)|
 |上海|[盛赫游戏](http://www.shengheyouxi.com)|2019年3月|大小周|[boss直聘](https://www.zhipin.com/gongsi/c57418b66b0cf3bf0nd52928.html?ka=brand_list_company_9)|
 |北京|[神策数据](https://www.sensorsdata.cn/)|2019年3月|大小周|[看准网](https://www.kanzhun.com/pl6409927.html)|
 |深圳|[跨越速运](http://www.ky-express.com/)|2018年8月|大小周、<br>加班、裁员|[如何看待跨越速运的裁员方式？ - 知乎](https://www.zhihu.com/question/312825261)|
+|上海|[拼多多](https://www.pinduoduo.com//)|2019年2月|11116、两班倒|[996还不敷，拼多多又玩两班倒，员工大喊：比富士康还狠](http://www.taobao92.com/thread-1313-1-1.html)|
+|上海|[砸立](https://m.eyee.com/)|2019年1月|996|[看准](https://www.kanzhun.com/gsr5728610tl526.html?ka=review-label2)|-|
+|武汉|[武汉氪细胞](http://www.timing360.com/)|2019年3月|996|名义上996，实际下班时间更晚|
+|杭州|[一喂智能科技](http://www.yivizd.com)|2017年5月-至今|996|[图片链接](http://note.youdao.com/noteshare?id=0113f40833aaebfc7bbb6c0f83d65f96)|
+|杭州|[智贝信息科技有限公司](https://www.zhipin.com/gongsi/09aefd7a9d507c2f1nd82tu9Ew~~.html)|2019年3月|强制996、歧视程序员|[程序员吐槽：薪资低，996加班无补助，歧视程序员，这hr真乃神人](https://baijiahao.baidu.com/s?id=1627625016599313128)|
+|深圳|[大疆创新](https://www.dji.com/cn)|2018年12月|996|[程序员猝死之后大疆称无加班文化 离职员工怒了](https://baijiahao.baidu.com/s?id=1619909152168711034&wfr=spider&for=pc)

externals/exposure.md

@@ -1,5 +1,7 @@
 # 曝光996公司及部门
 
+注意该投票页面存在被XSS攻击的情况，请谨慎。
+
 [进入投票](https://feathub.com/LinXueyuanStdio/996.ICU)
 
 :star: 曝光添加996公司，请先搜索，以免重复

externals/instruction.md

@@ -12,3 +12,24 @@ or equivalent Markdown code
 [![996.icu](https://img.shields.io/badge/link-996.icu-red.svg)](https://996.icu)
 ```
 <a href="https://996.icu"><img src="https://img.shields.io/badge/link-996.icu-red.svg" alt="996.icu"></a>
+
+Add License
+---
+#### Budget
+Markdown code for badget：
+```markdown
+[![LICENSE](https://img.shields.io/badge/license-NPL%20(The%20996%20Prohibited%20License)-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
+```
+[![LICENSE](https://img.shields.io/badge/license-NPL%20(The%20996%20Prohibited%20License)-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
+
+#### License file
+The 996ICU license is designed for multi-licensing, you can use it with other licenses like MIT in these ways:
+- Separate license files:
+  - In `LICENSE` file, list all licenses you used with `AND`.
+  - Add `LICENSE.996ICU` or `LINCES.NPL` file for details of 996ICU license.
+  - Add `LINCESE.MIT` file for details of MIT license.
+- Single license files:
+  - Add primary license content, such as MIT license.
+  - Add separation line like `----------`.
+  - Add 996ICU license content.
+