From 6b080e7f63a8eaa9abc9b31d4ff9166d58c80403 Mon Sep 17 00:00:00 2001 From: heliang Date: Mon, 1 Apr 2019 09:33:22 +0800 Subject: [PATCH 1/8] adjust order of some sentences for more coordination. --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d6382a..c939638 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,10 @@ What can I do? --- - Update this [list](blacklist/blacklist.md) with evidence to help every worker. -更新这个[名单](blacklist/blacklist.md)（附带证据），来帮助每一位工作者。 - Add this [badge](externals/instruction.md) to your project to support 996.ICU. -把这个[徽章](externals/instruction.md)加入你的项目来支持996.ICU +--- +- 更新这个[名单](blacklist/blacklist.md)（附带证据），来帮助每一位工作者。 +- 把这个[徽章](externals/instruction.md)加入你的项目来支持996.ICU The principle and purpose Of this repository! From de357bd0673e341fb962ecc46dbbb5074532219d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9C=9D=E6=9D=B0?= <821242814@qq.com> Date: Mon, 1 Apr 2019 10:23:34 +0800 Subject: [PATCH 2/8] blacklist/blacklist.md --- blacklist/blacklist.md | 1 + 1 file changed, 1 insertion(+) diff --git a/blacklist/blacklist.md b/blacklist/blacklist.md index 4fdf37b..f5a4d17 100644 --- a/blacklist/blacklist.md +++ b/blacklist/blacklist.md @@ -56,3 +56,4 @@ |杭州|[智贝科技](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)| |武汉|[氪细胞](http://www.timing360.com/)|2019年3月|996|名义上996，实际下班时间更晚
[考勤日历](img/timing360-0823.jpg)
[考勤规则](img/timing360-1201.jpg)| +|广州|[多益网络](https://www.duoyi.com)|2018年3月|9106|[看准](https://www.kanzhun.com/gsr1365983tl56.html)、[知乎](https://www.zhihu.com/question/22713470/answer/145287600)| \ No newline at end of file From 241423b5208e335f15842c7b913a40c02dc44825 Mon Sep 17 00:00:00 2001 From: bofeiw Date: Mon, 1 Apr 2019 13:32:34 +1100 Subject: [PATCH 3/8] Update blacklist.md --- blacklist/blacklist.md | 1 - 1 file changed, 1 deletion(-) diff --git a/blacklist/blacklist.md b/blacklist/blacklist.md index 4fdf37b..b1ae6c0 100644 --- a/blacklist/blacklist.md +++ b/blacklist/blacklist.md @@ -43,7 +43,6 @@ |广州|[鲸鱼游戏](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)| -|北京|[云族佳](https://www.clouderwork.com/)|2019年3月|996|[智联招聘](https://jobs.zhaopin.com/CC599223521J00125821109.htm)| |苏州|[苏州科技城](http://www.sstt.gov.cn/)|2019年3月|996|[智联招聘(请看html源代码)](https://jobs.zhaopin.com/CC549324722J00346803701.htm)| |北京|[中软国际](www.chinasofti.com/)|2019年3月|996|[智联招聘](https://jobs.zhaopin.com/CC508620126J00303154805.htm)| |北京|[柯莱特](http://www.camelotchina.com/)|2019年3月|996|[智联招聘](https://jobs.zhaopin.com/CC120179637J00117070515.htm)| From a9d6964a0fb0724ec39b6e03cba475d1f673398d Mon Sep 17 00:00:00 2001 From: djokovicwang Date: Mon, 1 Apr 2019 10:55:52 +0800 Subject: [PATCH 4/8] Update en_US.md Change Chinese punctuation to English punctuation --- i18n/en_US.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/i18n/en_US.md b/i18n/en_US.md index 26ba3db..74d6076 100644 --- a/i18n/en_US.md +++ b/i18n/en_US.md @@ -70,15 +70,15 @@ A "996" work schedule is in **blunt violation** of the _**Constitution of the Pe ### State Council Regulations on Working Hours of Employees -### Article 3： +### Article 3: > Workers and staff shall work 8 hours a day and 40 hours a week. -### Article 6： -> No unit or individual shall extend the working hours of their workers and staff without authorization. When the working hours are necessary to extend for the purpose of special case or emergent assignment， it shall be implemented according to the relevant provisions of the State. +### Article 6: +> No unit or individual shall extend the working hours of their workers and staff without authorization. When the working hours are necessary to extend for the purpose of special case or emergent assignment, it shall be implemented according to the relevant provisions of the State. ## Gaining popularity and publicity -- In early September 2016, it is reported by reliable sources that __*58.com*__ A.K.A. `58同城` (NYSE：WUBA), a classified advertisements company, introduced the "996" work schedule, without paying employees weekends overtime. The company later claimed that the schedule was only practised to manage extra workload during peak season(September and October) and this schedule is not mandatory. +- In early September 2016, it is reported by reliable sources that __*58.com*__ A.K.A. `58同城` (NYSE: WUBA), a classified advertisements company, introduced the "996" work schedule, without paying employees weekends overtime. The company later claimed that the schedule was only practised to manage extra workload during peak season(September and October) and this schedule is not mandatory. - In January 2019, __*Youzan*__ A.K.A. `有赞` (HKG: 8083), a Hangzhou-based E-commerce company, announced that the company would adopt "996" work schedule in the annual convention. Bai Ya, the CEO of Youzan, responded, From c38238ace20705af1c0bb4287aa10c0185e7fe8e Mon Sep 17 00:00:00 2001 From: 996icu <48942249+996icu@users.noreply.github.com> Date: Mon, 1 Apr 2019 11:16:06 +0800 Subject: [PATCH 5/8] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3d6382a..4baa720 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ ======= 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). +Join discussion at [slack](https://join.slack.com/t/996icu/shared_invite/enQtNTc5MTU4MDkxOTA1LTJlYWVmMGQxOWNjZDA2NzdkMzQ3MjkzYmFlYTAxMTczZGQ0NmQ5ZWY5MTVjODQ4MWFkZGRhMmRmY2UwZGUyOTQ). + [![Slack](https://img.shields.io/badge/slack-996ICU-%23de335e.svg)](https://join.slack.com/t/996icu/shared_invite/enQtNTc5MTU4MDkxOTA1LTJlYWVmMGQxOWNjZDA2NzdkMzQ3MjkzYmFlYTAxMTczZGQ0NmQ5ZWY5MTVjODQ4MWFkZGRhMmRmY2UwZGUyOTQ) [![LICENSE](https://img.shields.io/badge/license-NPL%20(The%20996%20Prohibited%20License)-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) From f5ccf34ee54b30cf6daf8007a1449a7f47fde97c Mon Sep 17 00:00:00 2001 From: 996icu <48942249+996icu@users.noreply.github.com> Date: Mon, 1 Apr 2019 11:18:06 +0800 Subject: [PATCH 6/8] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4baa720..c17055e 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,14 @@ ======= 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). -Join discussion at [slack](https://join.slack.com/t/996icu/shared_invite/enQtNTc5MTU4MDkxOTA1LTJlYWVmMGQxOWNjZDA2NzdkMzQ3MjkzYmFlYTAxMTczZGQ0NmQ5ZWY5MTVjODQ4MWFkZGRhMmRmY2UwZGUyOTQ). - [![Slack](https://img.shields.io/badge/slack-996ICU-%23de335e.svg)](https://join.slack.com/t/996icu/shared_invite/enQtNTc5MTU4MDkxOTA1LTJlYWVmMGQxOWNjZDA2NzdkMzQ3MjkzYmFlYTAxMTczZGQ0NmQ5ZWY5MTVjODQ4MWFkZGRhMmRmY2UwZGUyOTQ) [![LICENSE](https://img.shields.io/badge/license-NPL%20(The%20996%20Prohibited%20License)-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) [![HitCount](http://hits.dwyl.io/996icu/996.ICU.svg)](http://hits.dwyl.io/996icu/996.ICU) -> If you want to reference 996.icu badge, read [What can I do?](#what-can-i-do) as follow. +Join discussion at [slack](https://join.slack.com/t/996icu/shared_invite/enQtNTc5MTU4MDkxOTA1LTJlYWVmMGQxOWNjZDA2NzdkMzQ3MjkzYmFlYTAxMTczZGQ0NmQ5ZWY5MTVjODQ4MWFkZGRhMmRmY2UwZGUyOTQ). + +If you want to reference 996.icu badge, read [What can I do?](#what-can-i-do) as follow. Repo for counting stars and contributing. Press F to pay your respect to honorable developers. From f24d78493640f770659f5deae26064d1c8f2f94e Mon Sep 17 00:00:00 2001 From: djokovicwang Date: Mon, 1 Apr 2019 11:58:36 +0800 Subject: [PATCH 7/8] Update en_US.md Add a space before punctuation it is reported -> it was reported Youzan -> Youzan.com Highlight stock code --- i18n/en_US.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/en_US.md b/i18n/en_US.md index 74d6076..dfad422 100644 --- a/i18n/en_US.md +++ b/i18n/en_US.md @@ -78,13 +78,13 @@ A "996" work schedule is in **blunt violation** of the _**Constitution of the Pe ## Gaining popularity and publicity -- In early September 2016, it is reported by reliable sources that __*58.com*__ A.K.A. `58同城` (NYSE: WUBA), a classified advertisements company, introduced the "996" work schedule, without paying employees weekends overtime. The company later claimed that the schedule was only practised to manage extra workload during peak season(September and October) and this schedule is not mandatory. +- In early September 2016, it was reported by reliable sources that __*58.com*__ A.K.A. `58同城` (__*NYSE: WUBA*__), a classified advertisements company, introduced the "996" work schedule, without paying employees weekends overtime. The company later claimed that the schedule was only practised to manage extra workload during peak season (September and October) and this schedule is not mandatory. -- In January 2019, __*Youzan*__ A.K.A. `有赞` (HKG: 8083), a Hangzhou-based E-commerce company, announced that the company would adopt "996" work schedule in the annual convention. Bai Ya, the CEO of Youzan, responded, +- In January 2019, __*Youzan.com*__ A.K.A. `有赞` (__*HKG: 8083*__), a Hangzhou-based E-commerce company, announced that the company would adopt "996" work schedule in the annual convention. Bai Ya, the CEO of Youzan, responded, > "This will definitely be a right decision when we look back in a few years." -- In March 2019, it was reported that __*JD.com*__ A.K.A. `京东` (NASDAQ: JD), a major E-commerce company, started adopting "996" or "995" work schedules in some departments. The PR of JD posted on Maimai (`脉脉`, a Chinese real-name business social network platform), stated that +- In March 2019, it was reported that __*JD.com*__ A.K.A. `京东` (__*NASDAQ: JD*__), a major E-commerce company, started adopting "996" or "995" work schedules in some departments. The PR of JD posted on Maimai (`脉脉`, a Chinese real-name business social network platform), stated that > "(Our company culture is) to devote ourselves wholeheartedly (to achieve the business objectives)". From f63654f1865bfc95c78219a499f123eb36c733de Mon Sep 17 00:00:00 2001 From: tinytian Date: Mon, 1 Apr 2019 12:55:01 +0800 Subject: [PATCH 8/8] Update README.md --- README.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c17055e..5e30d29 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,10 @@ What can I do? - Update this [list](blacklist/blacklist.md) with evidence to help every worker. 更新这个[名单](blacklist/blacklist.md)（附带证据），来帮助每一位工作者。 - Add this [badge](externals/instruction.md) to your project to support 996.ICU. -把这个[徽章](externals/instruction.md)加入你的项目来支持996.ICU +把这个[徽章](externals/instruction.md)加入你的项目来支持 996.ICU -The principle and purpose Of this repository! +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. @@ -36,7 +36,7 @@ The principle and purpose Of this repository! * We are willing to hear all positive and constructive proposals and advocate for mature and responsible speech. -* We are working on the drafting of 996 License right now and we hope to get help from professionals with relevant experience. +* We are working on the drafting of 996ICU License right now and we hope to get help from professionals with relevant experience. ***** @@ -76,11 +76,8 @@ 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 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 version of 996ICU 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. - - -