Merge branch 'master' into patch-1

yaclong · Apr 3, 2019 · 06e3116 · 06e3116
2 parents 1f68410 + 338c945
commit 06e3116
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 Copyright (c) <year> <copyright holders>
 
-996 License Version 1.0 (Draft)
+Anti 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,

diff --git a/README.md b/README.md
@@ -13,8 +13,10 @@
 相关报道
 =======
 
-《中国青年报》：[被“996”工作制围困的年轻人：像是定好闹钟的机器](http://zqb.cyol.com/html/2019-04/02/nw.D110000zgqnb_20190402_1-02.htm)
-《人民网》：[“996工作制”是谁的如意算盘？](http://opinion.people.com.cn/n1/2019/0402/c119388-31009768.html)
+- 《中国青年报》：[被“996”工作制围困的年轻人：像是定好闹钟的机器](http://zqb.cyol.com/html/2019-04/02/nw.D110000zgqnb_20190402_1-02.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？
 ---

diff --git a/README_EN.md b/README_EN.md
@@ -21,7 +21,7 @@ What can I do?
 
 - Update this [list](blacklist/blacklist.md) with evidence to help every worker.  
 - Add this [badge](externals/instruction.md) to your project to support 996.ICU.  
-- License your awesome projects with the [996ICU License](LICENSE).  
+- License your awesome projects with the [Anti 996 License](LICENSE).  
 - Add proposals to give advise and suggestion about the development of 996.ICU.
 
 
@@ -85,7 +85,7 @@ License
 
  - 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
  - See a [full list of projects](awesomelist/projects.md) under Anti-996 License
- - It is an idea of @xushunke: [Design A Software License Of Labor Protection -- 996ICU License](https://github.com/996icu/996.ICU/pull/15642)
+ - It is an idea of @xushunke: [Design A Software License Of Labor Protection -- Anti 996 License](https://github.com/996icu/996.ICU/pull/15642)
  - This version of Anti-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 explanation, 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 is willing to contribute to further version directly, please go to [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft). Thank you.

diff --git a/awesomelist/projects.md b/awesomelist/projects.md
@@ -79,3 +79,5 @@ Projects under 996ICU License. Thanks for your support!
 | - | [Unity 3D ShaderLab Development Practice Introduction, 3rd version](https://github.com/AShine17cm/ShaderLab) |[Unity 3D ShaderLab Development Practice Introduction, 3rd version](https://github.com/AShine17cm/ShaderLab)| 《Unity 3D ShaderLab开发实战详解》第三版源码  |
 | <img src="https://static.oschina.net/uploads/logo/fastquery_8BhOo.png" width="60"> |[Fastquery](https://github.com/xixifeng/fastquery)|[Github](https://github.com/xixifeng/fastquery)|Open source DB extreme speed operating tool with an interface-oriented design style(开源DB极速操作工具,采用不得不面向接口的设计风格)|
 | - | [zoro](https://github.com/FaureWu/zoro) | [zoro](https://faurewu.github.io/zoro/) | zoro是一套基于redux的轻量级前端框架，用于快速接入redux，支持原生小程序wepy, taro, react等 |
+| - | [myTranslate](https://github.com/Julyme/myTranslate) | [GitHub](https://github.com/Julyme/myTranslate) | 一款基于eclipse的插件，用于翻译。 |
+| <img src="https://github.com/ChanpleCai/SmartTaskbar/blob/master/logo/logo_blue.png" width="60"> | [SmartTaskbar](https://github.com/ChanpleCai/SmartTaskbar) | [Github](https://github.com/ChanpleCai/SmartTaskbar) | A Lightweight Windows Taskbar Enhancement Utility  |
diff --git a/blacklist/blacklist.md b/blacklist/blacklist.md
@@ -68,7 +68,8 @@
 |北京|[北京必胜课教育科技有限公司](http://winlesson.com/)|2019年4月|966|[图片-1](img/bsk966-001.jpeg) [图片-2](img/bsk966-003.png)|
 |上海|[蝴蝶互动](http://hoodinn.hgame.com/default/index)|2019年2月|966|[知乎：如何评价蝴蝶互动？](https://www.zhihu.com/question/40858342/answer/616999472) / [聊天记录截图](img/蝴蝶互动-聊天记录.png) / ([所受委托资料-0](img/蝴蝶互动-报告委托截图-0.jpg)  [所受委托资料-1](img/蝴蝶互动-报告委托截图-1.jpg))|
 |深圳|[深圳市世纪纵横科技发展有限公司](http://www.viothink.com/?tdsourcetag=s_pctim_aiomsg)|2019年4月|966、加班、拖延工资|[拖欠工资](img/chat1.png),[拖欠工资](img/chat2.png),[拖欠工资](img/chat3.png)。而且经常加班到1、2点[加班1](img/taxi.jpg)[加班2](img/taxi2.jpg)[加班3](img/taxi3.jpg)。周六是强制上班|
-|北京|[北京关键科技股份有限公司](http://www.keyware.com.cn/)|2019年3月|986|986且没加班费不能换休[图片-1](img/keyware1.png) [图片-2](img/keyware2.png)|[公众号发布,说自发加班加点](https://mp.weixin.qq.com/s/3bB1csq2LYIWsvOjuHcAOQ)| 
+|北京|[北京关键科技股份有限公司](http://www.keyware.com.cn/)|2019年3月|986|986且没加班费不能换休[图片-1](img/keware1.png) [图片-2](img/keyware2.png)|[公众号发布,说自发加班加点](https://mp.weixin.qq.com/s/3bB1csq2LYIWsvOjuHcAOQ)| 
+|北京|[首约科技（北京）有限公司](https://www.01zhuanche.com/)|2019年3月|996|工作日无加班费无调休[图片-1](img/sq.png) [图片-2](img/sq2.png)|加班时长作为KPI评估标准| 
 
 更多不良公司（包括但不限于违法加班）请参见：
 [程序员找工作黑名单](https://github.com/shengxinjing/programmer-job-blacklist)
diff --git a/blacklist/img/sq.png b/blacklist/img/sq.png
diff --git a/blacklist/img/sq2.png b/blacklist/img/sq2.png
diff --git a/whitelist/whitelist.md b/whitelist/whitelist.md
@@ -29,3 +29,4 @@
 |城市|公司|曝光时间|制度描述|证据内容|
 |:---:|:---:|:---:|:---:|:---:|
 |成都|[四川锦程消费金融有限责任公司](http://www.jccfc.com/)|2019年4月|915-530-5|[考勤规则通知邮件](img/timing_20190401111520.png)|
+|深圳/北京/广州/上海..|[EXPEDIA GROUP 亿客行](https://lifeatexpedia.com/jobs?location=china)|一直都是呀|5x8=40|[连这也可以成为买点?!](img/worklifebalance4you.jpg)|