From 756b8668faeb04ce024fd1c10dc55579da56b3a6 Mon Sep 17 00:00:00 2001 From: iF2007 Date: Sat, 30 Mar 2019 10:02:33 +0800 Subject: [PATCH 1/8] `http` to `https` in exposure.md --- externals/exposure.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/externals/exposure.md b/externals/exposure.md index 7bd557d..21ce5ec 100644 --- a/externals/exposure.md +++ b/externals/exposure.md @@ -6,10 +6,10 @@ :star: 曝光添加996公司，（非强制）建议加上部门、省区、工资范围，越详细越好 -:star: 下面列表可能响应慢加载失败，可以点击 http://feathub.com/LinXueyuanStdio/996.ICU?format=svg 查看 +:star: 下面列表可能响应慢加载失败，可以点击 https://feathub.com/LinXueyuanStdio/996.ICU?format=svg 查看 添加新公司请点击下面这个按钮 [![Feature Requests](https://cloud.githubusercontent.com/assets/390379/10127973/045b3a96-6560-11e5-9b20-31a2032956b2.png)](https://feathub.com/LinXueyuanStdio/996.ICU) -[![Feature Requests](http://feathub.com/LinXueyuanStdio/996.ICU?format=svg)](http://feathub.com/LinXueyuanStdio/996.ICU) +[![Feature Requests](https://feathub.com/LinXueyuanStdio/996.ICU?format=svg)](https://feathub.com/LinXueyuanStdio/996.ICU) From 45d69e0942fbc3d74dad37f006b907e2fae59119 Mon Sep 17 00:00:00 2001 From: bofeiw Date: Sat, 30 Mar 2019 13:18:29 +1100 Subject: [PATCH 2/8] =?UTF-8?q?[update]=20=E6=8E=92=E5=BA=8F=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E5=88=97=E8=A1=A8=20=E5=9F=BA=E4=BA=8E=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=BA=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref: [https://www.fluentin3months.com/most-spoken-languages/](https://www.fluentin3months.com/most-spoken-languages/) --- i18n/i18n.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/i18n/i18n.md b/i18n/i18n.md index b661e2a..2239e42 100644 --- a/i18n/i18n.md +++ b/i18n/i18n.md @@ -2,15 +2,16 @@ Translations of 996.ICU's contents === * [简体中文](zh_CN.md) -* [繁體中文](zh_TW.md) -* [Русский](ru_RU.md) -* [Français](fr_FR.md) * [English](en_US.md) +* [हिन्दी](hin.md) +* [Español](es_MX.md) +* [Русский](ru_RU.md) +* [Português](pt_PT.md) +* [Français](fr_FR.md) +* [繁體中文](zh_TW.md) * [Deutsch](de_DE.md) * [Ελληνικά](gl-IT.md) * [Italiano](it_IT.md) -* [Português](pt_PT.md) -* [Español](es_MX.md) * [日本語](ja_JP.md) * [ไทย](th_TH.md) * [Việt Nam](vi_VN.md) @@ -22,4 +23,3 @@ Translations of 996.ICU's contents * [文言](lzh_Hant.md) * [tlhIngan Hol](tlh.md) * [0101](0101.md) -* [हिन्दी](hin.md) From e0c918d96d1a88c0d98041e28f71592bf3c82504 Mon Sep 17 00:00:00 2001 From: Edward Pan Date: Sat, 30 Mar 2019 02:47:00 +0000 Subject: [PATCH 3/8] =?UTF-8?q?Update=20=E6=96=87=E8=A8=80=20items=20to=20?= =?UTF-8?q?make=20contents=20more=20clear?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/i18n.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/i18n.md b/i18n/i18n.md index 992160d..0586e36 100644 --- a/i18n/i18n.md +++ b/i18n/i18n.md @@ -18,8 +18,8 @@ Translations of 996.ICU's contents * [Gaeilge na hÉireann](ga.md) * [Esperanto](epo.md) * [Irish](ga.md) -* [文言](lzh_Hans.md) -* [文言](lzh_Hant.md) +* [文言-简体中文](lzh_Hans.md) +* [文言-繁体中文](lzh_Hant.md) * [tlhIngan Hol](tlh.md) * [0101](0101.md) * [Persian](fa_IR.md) From ea9890f4a56ee3d7fee1a4668d17acaca7c4051e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=9E=9A=E9=91=AB?= Date: Sat, 30 Mar 2019 11:07:37 +0800 Subject: [PATCH 4/8] Fixed a grammatical error This should be a passive voice. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee4f140..376760e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Community powers - [996.LAW](https://github.com/Y1ran/996.Law) is a repo that collects useful information about cases between employees and enterprise. - - [996.TSC](https://github.com/lxlxw/996.TSC) is a repo that designed to let more people know and join the activity of the 996.ICU. + - [996.TSC](https://github.com/lxlxw/996.TSC) is a repo that is designed to let more people know and join the activity of the 996.ICU. - An [anonymous vote page](externals/exposure.md) shows a rank list of 996 (or more) companies. (Thanks to @LinXueyuanStdio) From 38d3e494c3bb4a5115dadf6539f5edde18cc72f9 Mon Sep 17 00:00:00 2001 From: Edward Pan Date: Sat, 30 Mar 2019 03:12:34 +0000 Subject: [PATCH 5/8] Fix text issue --- i18n/i18n.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/i18n.md b/i18n/i18n.md index 0586e36..2bc2905 100644 --- a/i18n/i18n.md +++ b/i18n/i18n.md @@ -19,7 +19,7 @@ Translations of 996.ICU's contents * [Esperanto](epo.md) * [Irish](ga.md) * [文言-简体中文](lzh_Hans.md) -* [文言-繁体中文](lzh_Hant.md) +* [文言-繁體中文](lzh_Hant.md) * [tlhIngan Hol](tlh.md) * [0101](0101.md) * [Persian](fa_IR.md) From 533ae30d9aa7c8fda9a745a9403c0051f1d1cdd8 Mon Sep 17 00:00:00 2001 From: xxc Date: Sat, 30 Mar 2019 11:24:54 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E5=88=97=20?= =?UTF-8?q?=E4=B8=BB=E7=AE=A1=E8=B4=9F=E8=B4=A3=E4=BB=BB=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 不良的管理者，通常才会怂恿996，添加一列耻辱柱 --- blacklist/blacklist.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/blacklist/blacklist.md b/blacklist/blacklist.md index 978d5de..1524185 100644 --- a/blacklist/blacklist.md +++ b/blacklist/blacklist.md @@ -12,16 +12,16 @@ 996(或其他剥削制度)公司黑名单 === -|(城市)公司名称|时间|制度描述|证据内容| -|:---|:---|:---|:---:| -|[58同城](http://www.58.com)|2016年9月初|996|[58同城实行全员996工作制 被指意图逼员工主动辞职](http://finance.cnr.cn/gs/20160901/t20160901_523105136.shtml)|-| -|[有赞](http://www.youzan.com)|2019年1月|996|[年会成了“鸿门宴”，这家公司“强制996”被员工举报](http://www.linkshop.com.cn/web/archives/2019/418163.shtml)|-| -|[北京京东](http://www.jd.com)|2019年3月|995|[京东回应995工作制：不会强制要求 但要全情投入.](http://tech.163.com/19/0312/13/EA2QGIOK00097U7R.html)|-| -|[途家网](https://www.tujia.com)|2017年12月|897|[加班邮件](https://user-images.githubusercontent.com/1802494/55235097-9ff12180-5267-11e9-831f-48268db033d2.jpeg)| -|[六安人论坛](http://www.luanren.com)|2019年03月|007|[微信群](http://vip.luanren.com/20190329.png)| -|[用友](http://www.yonyou.com/)|2018年12月|997|[知乎大量曝光](https://www.zhihu.com/question/26683235)| -|[阿里](https://www.alibabagroup.com/)|2018年6月|996|[天天快报](https://kuaibao.qq.com/s/20180612A1FAPU00)| -|[字节跳动](https://bytedance.com)|2017年7月|加班|[看准](https://www.kanzhun.com/gsr5622411tl56.html)| -|[苏宁](http://www.suning.com)|2019年3月|996|[知乎](https://www.zhihu.com/question/314152843/answer/613149536)| -|[深信服](http://www.sangfor.com.cn)|2019年3月|9106|[v2ex](https://www.v2ex.com/t/525495)| +|(城市)公司名称|时间|制度描述|证据内容|主管负责人| +|:---|:---|:---|:---:|:---:| +|[58同城](http://www.58.com)|2016年9月初|996|[58同城实行全员996工作制 被指意图逼员工主动辞职](http://finance.cnr.cn/gs/20160901/t20160901_523105136.shtml)|-|-| +|[有赞](http://www.youzan.com)|2019年1月|996|[年会成了“鸿门宴”，这家公司“强制996”被员工举报](http://www.linkshop.com.cn/web/archives/2019/418163.shtml)|-|-| +|[北京京东](http://www.jd.com)|2019年3月|995|[京东回应995工作制：不会强制要求 但要全情投入.](http://tech.163.com/19/0312/13/EA2QGIOK00097U7R.html)|-|-| +|[途家网](https://www.tujia.com)|2017年12月|897|[加班邮件](https://user-images.githubusercontent.com/1802494/55235097-9ff12180-5267-11e9-831f-48268db033d2.jpeg)|-| +|[六安人论坛](http://www.luanren.com)|2019年03月|007|[微信群](http://vip.luanren.com/20190329.png)|-| +|[用友](http://www.yonyou.com/)|2018年12月|997|[知乎大量曝光](https://www.zhihu.com/question/26683235)|-| +|[阿里](https://www.alibabagroup.com/)|2018年6月|996|[天天快报](https://kuaibao.qq.com/s/20180612A1FAPU00)|-| +|[字节跳动](https://bytedance.com)|2017年7月|加班|[看准](https://www.kanzhun.com/gsr5622411tl56.html)|-| +|[苏宁](http://www.suning.com)|2019年3月|996|[知乎](https://www.zhihu.com/question/314152843/answer/613149536)|-| +|[深信服](http://www.sangfor.com.cn)|2019年3月|9106|[v2ex](https://www.v2ex.com/t/525495)|-| From 2f3bfe476e69747b235f92521dbb2f3cfda62cc7 Mon Sep 17 00:00:00 2001 From: JameRoyar Date: Sat, 30 Mar 2019 11:26:29 +0800 Subject: [PATCH 7/8] Update blacklist.md --- blacklist/blacklist.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blacklist/blacklist.md b/blacklist/blacklist.md index 978d5de..41c2bb6 100644 --- a/blacklist/blacklist.md +++ b/blacklist/blacklist.md @@ -24,4 +24,4 @@ |[字节跳动](https://bytedance.com)|2017年7月|加班|[看准](https://www.kanzhun.com/gsr5622411tl56.html)| |[苏宁](http://www.suning.com)|2019年3月|996|[知乎](https://www.zhihu.com/question/314152843/answer/613149536)| |[深信服](http://www.sangfor.com.cn)|2019年3月|9106|[v2ex](https://www.v2ex.com/t/525495)| - +|[华为](https://www.huawei.com/cn/)|2019年3月|9106|[奋斗者协议](https://baike.baidu.com/item/%E5%A5%8B%E6%96%97%E8%80%85%E5%8D%8F%E8%AE%AE)| From e51b8bea43f83964c76dda3f35397df900fef55b Mon Sep 17 00:00:00 2001 From: 996icu Date: Sat, 30 Mar 2019 11:52:54 +0800 Subject: [PATCH 8/8] Rename language code --- i18n/i18n.md | 8 ++++---- i18n/{zh_CN.md => zh-Hans.md} | 0 i18n/{zh_TW.md => zh-Hant.md} | 0 i18n/{lzh_Hans.md => zh-lzh-Hans.md} | 0 i18n/{lzh_Hant.md => zh-lzh-Hant.md} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename i18n/{zh_CN.md => zh-Hans.md} (100%) rename i18n/{zh_TW.md => zh-Hant.md} (100%) rename i18n/{lzh_Hans.md => zh-lzh-Hans.md} (100%) rename i18n/{lzh_Hant.md => zh-lzh-Hant.md} (100%) diff --git a/i18n/i18n.md b/i18n/i18n.md index 05b328c..60d62e8 100644 --- a/i18n/i18n.md +++ b/i18n/i18n.md @@ -1,14 +1,14 @@ Translations of 996.ICU's contents === -* [简体中文](zh_CN.md) +* [简体中文](zh-Hans.md) * [English](en_US.md) * [हिन्दी](hin.md) * [Español](es_MX.md) * [Русский](ru_RU.md) * [Português](pt_PT.md) * [Français](fr_FR.md) -* [繁體中文](zh_TW.md) +* [繁體中文](zh-Hant.md) * [Deutsch](de_DE.md) * [Ελληνικά](gl-IT.md) * [Italiano](it_IT.md) @@ -19,8 +19,8 @@ Translations of 996.ICU's contents * [Gaeilge na hÉireann](ga.md) * [Esperanto](epo.md) * [Irish](ga.md) -* [文言-简体中文](lzh_Hans.md) -* [文言-繁體中文](lzh_Hant.md) +* [文言-简体中文](zh-lzh-Hans.md) +* [文言-繁體中文](zh-lzh-Hant.md) * [tlhIngan Hol](tlh.md) * [0101](0101.md) * [Persian](fa_IR.md) diff --git a/i18n/zh_CN.md b/i18n/zh-Hans.md similarity index 100% rename from i18n/zh_CN.md rename to i18n/zh-Hans.md diff --git a/i18n/zh_TW.md b/i18n/zh-Hant.md similarity index 100% rename from i18n/zh_TW.md rename to i18n/zh-Hant.md diff --git a/i18n/lzh_Hans.md b/i18n/zh-lzh-Hans.md similarity index 100% rename from i18n/lzh_Hans.md rename to i18n/zh-lzh-Hans.md diff --git a/i18n/lzh_Hant.md b/i18n/zh-lzh-Hant.md similarity index 100% rename from i18n/lzh_Hant.md rename to i18n/zh-lzh-Hant.md