Merge pull request #1 from 996icu/master

merge from upstream

README.md

@@ -2,7 +2,7 @@
 =======
 * [中文版](./README_CN.md)
 
-The name `996.ICU` refers to **"Work by '996', sick in ICU"**, an ironic saying among Chinese programmers, which means that by following the "996" work schedule, you are risking yourself getting into the ICU (Intensive Care Unit).
+The name `996.ICU` refers to **"Work by '996', sick in ICU"**, an ironic saying among Chinese developers, which means that by following the "996" work schedule, you are risking yourself getting into the ICU (Intensive Care Unit).
 
 [![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
 [![Badge](https://img.shields.io/badge/link-996.icu-red.svg)](https://996.icu/#/zh_CN)

README_CN.md

@@ -75,6 +75,8 @@
  - [996.LAW](https://github.com/Y1ran/996.Law) 法律板块，此 repo 主要收集大家的仲裁、民事诉讼信息。
 
  - [996.LIST](https://github.com/fengT-T/996_list) 此 repo 为 996 和 955 的匿名投票列表。
+ 
+ - [996.YAOCL](https://github.com/boycott996/yaocl) Yet Another Overtime Corps List, 另外一个匿名投票列表
 
  - [996.Leave](https://github.com/623637646/996.Leave) 介绍鼓励海外工作。
  

awesomelist/projects.md

@@ -35,7 +35,7 @@ Projects under Anti 996ICU License. Thanks for your support!
 | - | [easy-filter](https://github.com/PsChina/easy-filter) | [Github](https://github.com/PsChina) / [npm](https://www.npmjs.com/package/easy-filter) | vue2.x 过滤器插件 |
 | - | [Vueg](https://github.com/jaweii/Vueg----page-transition-plugin) | [Github](https://github.com/jaweii/Vueg----page-transition-plugin) | Page level transition plugin for vue-router|
 | - | [one](https://github.com/lizhichao/one) | [Github](https://github.com/lizhichao/one) | 一个极简的高性能常驻内存php框架|
-| - | [vue-color-ui](https://github.com/martin-yin/vue-color-ui) | [Github](https://github.com/martin-yin/vue-color-ui) | 微信小程序color-ui的vue版本 |
+| <img src="https://raw.githubusercontent.com/martin-yin/Pipi-Dinosaur/master/src/assets/logo.png" width="60"> | [Pipi-Dinosaur](https://github.com/martin-yin/Pipi-Dinosaur) | [Github](https://github.com/martin-yin/Pipi-Dinosaur) |皮皮🦖 微信小程序color-ui的vue版本 |
 | - | [WxJava](https://github.com/Wechat-Group/WxJava) | [Github](https://github.com/Wechat-Group/WxJava) | 微信开发 Java SDK|
 | - | [cyclone](https://github.com/simpleapples/cyclone) | [Github](https://github.com/simpleapples/cyclone) | Cyclone is a go package to spawn, reuse and manage a number of goroutines by a pool. |
 | - | [NumbCube](https://github.com/KirosHan/NumbCube) | [Github](https://github.com/KirosHan/NumbCube) | NumbCube流媒体直播解决方案 |
@@ -98,3 +98,11 @@ Projects under Anti 996ICU License. Thanks for your support!
 | - | [node-gd-bmp](https://github.com/zengming00/node-gd-bmp) | [GitHub](https://github.com/zengming00/node-gd-bmp) | light and high speed and 100% js implement graphical library, it can running in any platform  |
 | <img src="https://github.com/Mainvooid/arxiv.repo/blob/master/icon.png" width="60"> | [arxiv.repo](https://github.com/Mainvooid/arxiv.repo) | [Github](https://github.com/Mainvooid/arxiv.repo) | arXiv上公开了项目源码的论文合集 |
 | - | [996-icu-banner](https://github.com/SamChou19815/996-icu-banner) | [GitHub](https://github.com/SamChou19815/996-icu-banner) / [Demo](https://996-icu-banner.developersam.com/) / [npm](https://www.npmjs.com/package/@dev-sam/996-icu-banner) | The banner for your personal website to show support for 996.icu. |
+| - | [Tetris](https://github.com/deepgrace/tetris) | [GitHub](https://github.com/deepgrace/tetris) | Tetris in all kinds of Languages |
+| - | [Carrier](https://github.com/deepgrace/carrier) | [GitHub](https://github.com/deepgrace/carrier) | Modern C++ Network Server FrameWork |
+| - | [Giant](https://github.com/deepgrace/giant) | [GitHub](https://github.com/deepgrace/giant) | Algorithms and Data Structures in Modern C++ |
+| - | [Monster](https://github.com/deepgrace/monster) | [GitHub](https://github.com/deepgrace/monster) | Advanced Template MetaProgramming in Modern C++ |
+| - | [Stored Programs](https://github.com/deepgrace/stored.programs) | [GitHub](https://github.com/deepgrace/stored.programs) | Stored Programs (Function, View, Trigger and Stored Procedure) in SQL |
+| - | [CSI Enhancement Tools](https://github.com/shuspieler/Athero-CSI-tool-Python-RemoteReceive-Liveview-AmplitudeScaled) | [GitHub](https://github.com/shuspieler/Athero-CSI-tool-Python-RemoteReceive-Liveview-AmplitudeScaled) | CSI (Channel State Information) Enhancement Tools |
+| - | [Thymeleaf-Reference-Guide](https://github.com/jack80342/Thymeleaf-Reference-Guide) | [GitHub](https://github.com/jack80342/Thymeleaf-Reference-Guide) | Thymeleaf 3.0 中文翻译 -《Thymeleaf参考指南》 |
+| - | [Spring-Boot-Reference-Guide](https://github.com/jack80342/Spring-Boot-Reference-Guide) | [GitHub](https://github.com/jack80342/Spring-Boot-Reference-Guide) | Spring Boot Reference Guide 2.0 中文翻译 -《Spring Boot参考指南》 |

blacklist/blacklist.md

@@ -1,7 +1,5 @@
-**请注意：维护本列表的目的在于为《中华人民共和国劳动法》的执行提供参考依据。**
 
-996（或其他违法加班制度）公司名单
+**请注意：维护本列表的目的在于为《中华人民共和国劳动法》的执行提供参考依据。**
-===
 违法加班制度是指违反相关法律法规及劳动合同，未经与工会和劳动者协商便强制加班加点<sup>1</sup>，或加班加点超出法定时限（每日三小时或每月三十六小时）<sup>2</sup>，或未足额支付加班加点工资报酬（不低于工资的百分之一百五十）<sup>3</sup>的非法用工制度。
 
 1. [《中华人民共和国劳动法》](http://www.npc.gov.cn/npc/xinwen/2019-01/07/content_2070261.htm)第四章第四十一条
@@ -42,7 +40,7 @@
 |北京|[京东](https://www.jd.com)|2019年3月|995|[京东回应995工作制：不会强制要求 但要全情投入](http://tech.163.com/19/0312/13/EA2QGIOK00097U7R.html)<br>[刘强东内部邮件称要淘汰或协商解决掉“三种人”](https://i.loli.net/2019/04/02/5ca2e8727f213.jpg)|
 |北京|[58同城](https://www.58.com)|2016年9月|996|[58同城实行全员996工作制 被指意图逼员工主动辞职](http://finance.cnr.cn/gs/20160901/t20160901_523105136.shtml)|
 |南京|[苏宁](http://www.suning.com)|2019年3月|996|[如何评价今年苏宁正式实行996工作制?](https://www.zhihu.com/question/314152843/answer/613149536)|
-|北京|[途家网](https://www.tujia.com)|2017年12月|897|[暴力裁员、996加班、发感冒冲剂、公司搭睡觉帐篷、诉讼材料](https://iamybj.github.io/tujia/)|
+|北京|[途家网](https://www.tujia.com)|2017年12月|897|[暴力裁员、996加班、发感冒冲剂、搭睡觉帐篷、诉讼材料](https://www.tujia.xyz/)|
 |杭州|[有赞](https://www.youzan.com)|2019年1月|996|[年会成了“鸿门宴”，这家公司“强制996”被员工举报](http://www.linkshop.com.cn/web/archives/2019/418163.shtml)|
 |北京|[字节跳动](https://bytedance.com)|2017年7月|加班|[看准网](https://www.kanzhun.com/gsr5622411tl56.html)、[搜狐](https://www.sohu.com/a/256795805_231667)|
 |上海|[拼多多](https://www.pinduoduo.com//)|2019年2月|11116、两班倒|[996还不敷，拼多多又玩两班倒，员工大喊：比富士康还狠](http://www.taobao92.com/thread-1313-1-1.html)|
@@ -57,7 +55,7 @@
 |北京|[柯莱特](http://www.camelotchina.com/)|2019年3月|996|[智联招聘](https://jobs.zhaopin.com/CC120179637J00117070515.htm)|
 |北京|[高伟达](http://www.git.com.cn/)|2019年3月|996|[智联招聘](https://jobs.zhaopin.com/CC120702341J00114014810.htm)|
 |深圳|[华为外包](https://www.kanzhun.com/gsr1439970.html)|2018年3月|大小周、加班、裁员|[华为外包是怎样的体验？ - 知乎](https://www.zhihu.com/question/28517881)|
-|深圳|[跨越速运](http://www.ky-express.com/)|2018年8月|大小周、<br>加班、裁员|[如何看待跨越速运的裁员方式？ - 知乎](https://www.zhihu.com/question/312825261)|
+|深圳|[跨越速运](http://www.ky-express.com/)|2018年8月|大小周、<br>加班、裁员|[如何看待跨越速运的裁员方式？ - 知乎](https://www.zhihu.com/question/312825261)<br> [跨越的水军洗地被抓现行](https://www.zhihu.com/question/47203239/answer/643311492)|
 |上海|[砸立](https://m.eyee.com/)|2019年1月|996|[看准网](https://www.kanzhun.com/gsr5728610tl526.html?ka=review-label2)|
 |杭州|[一喂](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)|
@@ -81,6 +79,10 @@
 |嘉兴|[蓝鸽集团有限公司](http://www.chinalancoo.com)|2019年4月4日|每月仅加班需满50小时|[工资中的一半是要靠加班和绩效才能取得](https://tieba.baidu.com/f?kz=4421231059&mo_device=1&ssid=0&from=844b&uid=0&pu=usm@2,sz@320_1001,ta@iphone_2_7.0_24_67.0&bd_page_type=1&baiduid=16C9EAE1D7D54FAC1A178F5882C9EBD3&tj=h5_mobile_1_0_10_l4&referer=m.baidu.com?pn=0&)
 |上海|[依图网络科技有限公司](http://www.yitutech.com/)|2019年4月5日|996|[知乎](https://www.zhihu.com/question/300132949/answer/606529193)|
 |深圳|[深圳市环球易购电子商务有限公司](https://www.globalegrow.com/)|2007年5月|大小周、经常996、偶尔通宵|[劳动合同](img/globalegrow_labor_contract.jpg)、[Offer](img/globalegrow_offer.jpg)+亲历|
+|杭州|[杭州海康威视数字技术股份有限公司](https://www.hikvision.com/cn/)|2018年|996|(https://www.kanzhun.com/pl6448138.html)|
+|杭州|[浙江大华技术股份有限公司](https://www.dahuatech.com/)|2018年|加班|(http://www.7360.cc/Review-80253)(https://www.kanzhun.com/pl6360251.html)|
+|杭州|[浙江宇视科技有限公司](http://fenxiao.uniview.com/)|2018年|大小周加班|(https://www.kanzhun.com/gsmsh10805642.html)
+
 
 更多不良公司（包括但不限于违法加班）请参见：
 [程序员找工作黑名单](https://github.com/shengxinjing/programmer-job-blacklist)

externals/news.md

@@ -2,6 +2,7 @@
 
 ## 中文媒体
 - 人民日报： [工作996生病ICU，劳动监察部门应积极介入](https://m.weibo.cn/status/4357697258275940)
+- 光明网： [莫让“996工作制”成了职场明规则](http://guancha.gmw.cn/2019-04/06/content_32719988.htm)
 - 人民网：[“996工作制”是谁的如意算盘？](http://opinion.people.com.cn/n1/2019/0402/c119388-31009768.html)
 - 南方日报：[正视年轻人压力“爆棚”的危险](http://epaper.southcn.com/nfdaily/html/2019-04/03/content_7790850.htm)
 - 广州日报：[“996工作制”不可持续](http://gzdaily.dayoo.com/pc/html/2019-04/03/content_108225_594534.htm)
@@ -18,6 +19,10 @@
 - 端传媒：[朝九晚九每週六天：大陸程序員GitHub上抗議996血汗加班，能否凱旋歸來？](https://theinitium.com/roundtable/20190404-roundtable-zh-996icu/)
 - 联合新闻网：[工程師大串連！在github上用程式碼抗議996血汗加班制](https://udn.com/news/story/7086/3728572)（[Wayback Machine](https://web.archive.org/web/20190331140919/https://udn.com/news/story/7086/3728572)）
 - 观察者：[程序员们揭露“996ICU” 互联网公司：华为阿里等上榜](https://www.guancha.cn/politics/2019_04_05_496491_s.shtml)
+- 21财经：[工作996，生病ICU！程序员们这次忍不了了，弄出个大项目](https://m.21jingji.com/article/20190404/herald/23b634af7003164f1ca6f602772a5c71.html)
+- 新浪资讯：[沉默or抵制? 多家互联网公司被指实行996工作制](https://zx.sina.cn/2019-04-06/zx-ihvhiqax0377991.d.html?wm=3049_0015)
+- 爱范儿：[病态的 996 早需改变，而且不应该只从程序员开始](https://mp.weixin.qq.com/s/4YVDRAHl3E4AF163xhDKjA)（[Wayback Machine](https://web.archive.org/web/20190406123533/https://mp.weixin.qq.com/s/4YVDRAHl3E4AF163xhDKjA)）
+
 ### 非中国媒体
 - BBC中文网：[中国程序员GitHub上抗议“996”血汗加班走红网络](https://www.bbc.com/zhongwen/simp/chinese-news-47824716)
 - 美国之音：[中国科技工作者在线抗议“996”工作制](https://www.voachinese.com/a/china-tech-labor-996-20190404/4862315.html)

proposal/proposal_To_Request_Github_Official_Including_996ICU_License.md

@@ -24,10 +24,10 @@ To Request Github Official Including 996ICU License <br/>
 ## Community Value
 ## 社区价值
 
-Remarkable 996ICU License badge <br/>
+Highlight 996ICU License badge <br/>
 让 996ICU License badge 更显眼 <br/>
 
-Let 996ICU License be chosen easily <br/>
+Promote adoption of 996ICU License <br/>
 让 996ICU License 更易用 <br/>
 
 ## Problems
@@ -87,7 +87,7 @@ Feel free to fill here.
 
 Right now there is more than 1600 repos  using 996 license  by  [github code search](https://github.com/search?q=996+filename%3ALICENSE&type=code) .  
 
-So Item No.3 has **Fitted**, but the consensus in 996 licenses are not.
+So the 3rd requirement is satisfied, but the consensus in 996 licenses are not.
 
 As for Item No.4,  there is [996.ICU](https://github.com/996icu/996.ICU), [955.WLB](https://github.com/formulahendry/955.WLB) and [Anti-996-License](https://github.com/kattgu7/Anti-996-License/issues?q=is%3Aopen+is%3Aissue) and a lot of repos with stars more than 3k.  I am not sure about the word "notable ".  I think  Item No.4 is **fitted**.