Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
996icu committed Apr 25, 2019
2 parents a565a42 + 7111674 commit 894faa0
Show file tree
Hide file tree
Showing 9 changed files with 127 additions and 111 deletions.
2 changes: 1 addition & 1 deletion ANTI-996 DAY.MD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ANTI-996 DAY

**Date: March 26th of each year.**

On March 26th, 2019, a Chinese programmer @996icu created a GitHub project 996.ICU. This project is about the 996-working mode in China. The project received more than 100,000 stars in just three days, and many Chinese programmers translated the project into multiple languages. We recommend the name "ANTI-996 DAY" on March 26th each year.
On March 26th, 2019, a Chinese programmer @996icu created a GitHub project 996.ICU. This project is about the 996-working mode in China. The project received more than 100,000 stars in just three days, and many Chinese programmers translated the project into multiple languages. We recommend to promote March 26th for each year as "ANTI-996 DAY".



Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ 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 popularity. Serving a company that encourages the "996" work schedule usually means working for at least 60 hours per week.
Visit [996 working hour system](https://en.wikipedia.org/wiki/996_working_hour_system) on wikipedia for more details.
Visit [996 working hour system](https://en.wikipedia.org/wiki/996_working_hour_system) on Wikipedia for more details.


What can I do?
Expand Down Expand Up @@ -59,7 +59,7 @@ Please feel free to [translate 996.ICU's contents](i18n/README.md), adjust the f
Community powers
---

- [955.WLB](https://github.com/formulahendry/955.WLB) is a repo that maintains a whitelist of 955 worklife balanced companies.
- [955.WLB](https://github.com/formulahendry/955.WLB) is a repo that maintains a whitelist of 955 work-life balanced companies.
- [996.LIST](https://github.com/fengT-T/996_list) is a repo of a rank list of 996 companies and 955 companies.
- [996.law](https://github.com/CPdogson/996.law) This is a manual for workers who want to conduct labor arbitration and litigation on their own.
- [996.YAOCL](https://github.com/boycott996/yaocl) Yet Another Overtime Corps List, current another anonymous voting list.
Expand All @@ -86,7 +86,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 weigh their way of working
- See a [full list of projects](awesomelist/README.md) under Anti-996 License

- 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.
- This draft is adapted from the MIT license. For a 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 future version directly, please go to [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft). Thank you.

Contact
Expand Down
1 change: 1 addition & 0 deletions awesomelist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,4 @@ Projects under Anti 996ICU License. Thanks for your support!
| <img src="./img/kongfuofarchitecticon.png" width="60"> | [KongFuOfArchitect](https://github.com/xiaomiwujiecao/KongFuOfArchitect) | [Github](https://github.com/xiaomiwujiecao/KongFuOfArchitect) | ![](https://img.shields.io/github/stars/xiaomiwujiecao/KongFuOfArchitect.svg) | 架构师的功夫(包含思想指引、学习资源汇总、范式编程、高效成长、必备算法、等等,为想成为架构师的人铺路) ! | ![](https://img.shields.io/badge/license-Anti%20996-blue.svg) |
|-|[go worker pool](https://github.com/sinomoe/go_worker_pool)|[Github](https://github.com/sinomoe/go_worker_pool)|![](https://img.shields.io/github/stars/sinomoe/go_worker_pool.svg)|goroutine并发控制、调度工具|[![LICENSE](https://badges.frapsoft.com/os/mit/mit.svg)](https://opensource.org/licenses/mit-license.php)|
|-|[grpc man](https://www.npmjs.com/package/grpc-man)|[Github](https://github.com/Jeff-Tian/grpc-man) / [Official](https://www.npmjs.com/package/grpc-man)|![](https://img.shields.io/github/stars/jeff-tian/grpc-man.svg)|一个 gRPC 客户端,可以灵活地调用 gRPC 服务。名字灵感来源于 `post-man`|[![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)|
| <img src="https://github.com/Red-Error404/Emerald/blob/master/emerald.png" width="60"> | [Emerald](https://github.com/Red-Error404/Emerald) | [GitHub](https://github.com/Red-Error404/Emerald) | ![](https://img.shields.io/github/stars/Red-Error404/Emerald.svg) | 面向游戏开发的轻量级绘图框架 | ![](https://img.shields.io/github/license/Red-Error404/Emerald.svg) |
2 changes: 2 additions & 0 deletions blacklist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,5 @@
|潍坊|[歌尔股份](https://www.goertek.com/)|2019年4月|大小周、节假日遇单休从双休周调休|[考勤规定](img/goertek.jpeg) [放假安排1](img/goertek-1.jpg) [放假安排2](img/goertek-2.jpg)|
|济南|[浪潮集团](http://www.inspur.com/)|-----|996|奋进者申请书 [996工作制](https://baike.baidu.com/item/996%E5%B7%A5%E4%BD%9C%E5%88%B6/19940031?fromtitle=996&fromid=19958311&fr=aladdin#3)|
|深圳|[紫优科技](https://www.zhipin.com/gongsir/7610a4892e11cc781XZ_09i1FA~~.html?ka=company-jobs)|2019年4月|9116| [公司老板发的招聘信息](img/深圳紫优科技.jpg)|
|上海/西安|[华勤通讯技术有限公司](http://www.huaqin.com/)|2019年4月|996| [看准网](https://www.kanzhun.com/gso238619.html?ka=com1-title) [知乎](https://www.zhihu.com/question/49628909/answer/522467068)|
|北京|[小猪短租](http://www.xiaozhu.com/)|-----|997|4.22-5.10连续上班,晚上默认加班,不加班领导会找谈话。[工作截图](img/小猪短租.jpg)|
3 changes: 2 additions & 1 deletion externals/news_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ Related press:
* *The Guardian:* [Microsoft workers decry grueling '996' working standard at Chinese tech firms](https://www.theguardian.com/technology/2019/apr/22/microsoft-workers-decry-grueling-996-working-standard-at-chinese-tech-firms). 23 April, 2019
* *Bloomberg:* [Microsoft Workers Criticize Block of GitHub Protest in China](https://www.bloomberg.com/news/articles/2019-04-22/microsoft-workers-criticize-block-of-github-protest-in-china). 22 April, 2019
* *THE VERGE:* [Microsoft workers pressure company to stand by embattled Chinese GitHub repo](https://www.theverge.com/2019/4/22/18511088/microsoft-github-tech-censorship-996-repository-china). 23 April, 2019

* *The Register:* [Fed up with 72-hour, six-day working weeks, IT workers emit cries for help via GitHub repo](https://www.theregister.co.uk/2019/04/23/microsoft_github_china/). 23 April, 2019
* *GIZMODO:* [Microsoft and GitHub Workers Take a Stand Against Grueling, Inhumane '996' Culture in China](https://gizmodo.com/microsoft-and-github-workers-take-a-stand-against-gruel-1834210579). 22 April, 2019
3 changes: 3 additions & 0 deletions externals/video.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# 相关视频
---
[996的一天生活,这样的福报hold不住](https://www.bilibili.com/video/av50275461)
Loading

0 comments on commit 894faa0

Please sign in to comment.