From 5c73201705d75c91c207163d38df79b874fb6d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=85=A7=E6=AD=A6?= Date: Mon, 1 Apr 2019 19:01:20 +0800 Subject: [PATCH 01/17] [Chore]update awesomelist --- awesomelist/projects.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/awesomelist/projects.md b/awesomelist/projects.md index 9aeb3b1..9b61934 100644 --- a/awesomelist/projects.md +++ b/awesomelist/projects.md @@ -9,11 +9,12 @@ Projects under 996ICU License. Thanks for your support! | - | [optimize-vue](https://github.com/ChangedenCZD/optimize-vue) |[ChangedenCZD](https://github.com/ChangedenCZD)| 基于 vue-cli 3.0 构建的快速开发框架 | | - | [optimize-vue-cli](https://github.com/ChangedenCZD/optimize-vue-cli) |[ChangedenCZD](https://github.com/ChangedenCZD)| 基于 vue-cli 3.0 构建的快速开发框架的脚手架 | | - | [thinkphp5-restfulapi](https://github.com/Leslin/thinkphp5-restfulapi) |(https://github.com/Leslin)| 基于 thinkphp5 开发的restful api快速开发框架 | -| ![](https://mybatis.plus/img/logo.png) | [MybatisPlus](https://github.com/baomidou/mybatis-plus)|[MybatisPlus](https://mybatis.plus/)| Mybatis 扩展组件 | -| ![](https://avatars0.githubusercontent.com/u/33191460?s=200&v=4) | [server](https://github.com/wildfirechat/server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，server端 | +| | [MybatisPlus](https://github.com/baomidou/mybatis-plus)|[MybatisPlus](https://mybatis.plus/)| Mybatis 扩展组件 | +| | [server](https://github.com/wildfirechat/server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，server端 | | | [android-chat](https://github.com/wildfirechat/android-chat) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，Android平台 SDK和Demo | | | [ios-chat](https://github.com/wildfirechat/ios-chat) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，iOS平台 SDK和Demo | | | [pc-chat](https://github.com/wildfirechat/pc-chat) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，PC 平台 Demo | | | [app_server](https://github.com/wildfirechat/app_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，应用服务 | | | [robot_server](https://github.com/wildfirechat/robot_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，机器人服务 | -| - | [WeChatBlog](https://github.com/NiZerin/WeChatBlog) |[NiZerin](https://github.com/NiZerin)| 微信小程序 & 个人博客 & WordPress REST API | +| - | [WeChatBlog](https://github.com/NiZerin/WeChatBlog) |[NiZerin](https://github.com/NiZerin)| 微信小程序 & 个人博客 & WordPress REST API | +| | [You-need-to-know-css](https://github.com/l-hammer/You-need-to-know-css) |[-](https://lhammer.cn/You-need-to-know-css)| 💄CSS tricks for web developers~ | From f060cd405d518201f2152c74f4627d50b4126212 Mon Sep 17 00:00:00 2001 From: huyf Date: Mon, 1 Apr 2019 19:58:42 +0800 Subject: [PATCH 02/17] Update projects.md --- awesomelist/projects.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awesomelist/projects.md b/awesomelist/projects.md index d84503f..e14e75a 100644 --- a/awesomelist/projects.md +++ b/awesomelist/projects.md @@ -18,3 +18,5 @@ Projects under 996ICU License. Thanks for your support! | | [robot_server](https://github.com/wildfirechat/robot_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，机器人服务 | | - | [WeChatBlog](https://github.com/NiZerin/WeChatBlog) |[NiZerin](https://github.com/NiZerin)| 微信小程序 & 个人博客 & WordPress REST API | | ![](https://github.com/cookieY/Yearning/blob/master/logo.png) | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 | +| | [java-multi-thread-programming](https://github.com/loveincode/java-multi-thread-programming) |[java-multi-thread-programming/](https://loveincode.github.io/java-multi-thread-programming/)| 《Java多线程编程核心技术》源码 | +| ![](https://loveincode.github.io/notes/assets/img/logo.png)| [notes](https://github.com/loveincode/notes) |[https://loveincode.github.io/notes/](https://loveincode.github.io/notes/)| 一个Java后端工程师的学习笔记 | From c4a58ef02ae0cc098fd149a451da0caf49b0f745 Mon Sep 17 00:00:00 2001 From: huyf Date: Mon, 1 Apr 2019 20:00:12 +0800 Subject: [PATCH 03/17] Update projects.md --- awesomelist/projects.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awesomelist/projects.md b/awesomelist/projects.md index e14e75a..d78115b 100644 --- a/awesomelist/projects.md +++ b/awesomelist/projects.md @@ -19,4 +19,4 @@ Projects under 996ICU License. Thanks for your support! | - | [WeChatBlog](https://github.com/NiZerin/WeChatBlog) |[NiZerin](https://github.com/NiZerin)| 微信小程序 & 个人博客 & WordPress REST API | | ![](https://github.com/cookieY/Yearning/blob/master/logo.png) | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 | | | [java-multi-thread-programming](https://github.com/loveincode/java-multi-thread-programming) |[java-multi-thread-programming/](https://loveincode.github.io/java-multi-thread-programming/)| 《Java多线程编程核心技术》源码 | -| ![](https://loveincode.github.io/notes/assets/img/logo.png)| [notes](https://github.com/loveincode/notes) |[https://loveincode.github.io/notes/](https://loveincode.github.io/notes/)| 一个Java后端工程师的学习笔记 | +| | [notes](https://github.com/loveincode/notes) |[https://loveincode.github.io/notes/](https://loveincode.github.io/notes/)| 一个Java后端工程师的学习笔记 | From 61bd6b7a2ca124e983920367f94184935996d3d9 Mon Sep 17 00:00:00 2001 From: EnyuCao Date: Mon, 1 Apr 2019 14:06:11 +0200 Subject: [PATCH 04/17] =?UTF-8?q?Add=20Svenska=20=E7=91=9E=E5=85=B8?= =?UTF-8?q?=E8=AF=AD=20to=20translation=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/i18n.md | 1 + 1 file changed, 1 insertion(+) diff --git a/i18n/i18n.md b/i18n/i18n.md index a2c6405..f93f0fc 100644 --- a/i18n/i18n.md +++ b/i18n/i18n.md @@ -24,3 +24,4 @@ Translations of 996.ICU's contents * [tlhIngan Hol](tlh.md) * [Persian](fa_IR.md) * [Finnish](fi_FI.md) +* [Svenska](se_SE.md) From 2cd2babe505e5c7221c4b589b2a91f227e301ae8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 1 Apr 2019 20:37:04 +0800 Subject: [PATCH 05/17] Set the most famous companies to the top --- blacklist/blacklist.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/blacklist/blacklist.md b/blacklist/blacklist.md index 8affdf6..ea3452b 100644 --- a/blacklist/blacklist.md +++ b/blacklist/blacklist.md @@ -29,18 +29,20 @@ --- |所在城市|公司名字|曝光时间|制度描述|证据内容| |:---:|:---:|:---:|:---:|:---:| -|北京|[58同城](https://www.58.com)|2016年9月|996|[58同城实行全员996工作制 被指意图逼员工主动辞职](http://finance.cnr.cn/gs/20160901/t20160901_523105136.shtml)| -|杭州|[有赞](https://www.youzan.com)|2019年1月|996|[年会成了“鸿门宴”，这家公司“强制996”被员工举报](http://www.linkshop.com.cn/web/archives/2019/418163.shtml)| +|深圳|[华为](https://www.huawei.com/cn/)|2010年8月|9106|[华为：“自愿”的奋斗者协议](http://focus.news.163.com/10/0921/15/6H460OOP00011SM9.html)| +|杭州|[阿里巴巴](https://www.alibabagroup.com/)|2018年6月|996|[阿里巴巴的996加班文化，看到这些恐怖数据，你也会辞职！](https://kuaibao.qq.com/s/20180612A1FAPU00)| +|杭州|[蚂蚁金服](https://www.antfin.com/)|2018年11月|9106|[阿里前员工吐槽：从蚂蚁金服离职了，真的拿员工当蚂蚁使](https://t.cj.sina.com.cn/articles/view/6680234487/18e2c49f700100dq3q)| |北京|[京东](https://www.jd.com)|2019年3月|995|[京东回应995工作制：不会强制要求 但要全情投入.](http://tech.163.com/19/0312/13/EA2QGIOK00097U7R.html)| +|北京|[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.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)| +|深圳|[大疆创新](https://www.dji.com/cn)|2018年12月|996|[程序员猝死之后大疆称无加班文化 离职员工怒了](https://baijiahao.baidu.com/s?id=1619909152168711034&wfr=spider&for=pc)| |北京|[途家网](https://www.tujia.com)|2017年12月|897|[加班邮件、诉讼材料](https://iamybj.github.io/tujia/)| |六安|[六安人论坛](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|[阿里巴巴的996加班文化，看到这些恐怖数据，你也会辞职！](https://kuaibao.qq.com/s/20180612A1FAPU00)| -|杭州|[蚂蚁金服](https://www.antfin.com/)|2018年11月|9106|[阿里前员工吐槽：从蚂蚁金服离职了，真的拿员工当蚂蚁使](https://t.cj.sina.com.cn/articles/view/6680234487/18e2c49f700100dq3q)| -|北京|[字节跳动](https://bytedance.com)|2017年7月|加班|[看准](https://www.kanzhun.com/gsr5622411tl56.html)、[搜狐](https://www.sohu.com/a/256795805_231667)| -|南京|[苏宁](http://www.suning.com)|2019年3月|996|[如何评价今年苏宁正式实行996工作制?](https://www.zhihu.com/question/314152843/answer/613149536)| |深圳|[深信服](http://www.sangfor.com.cn)|2019年3月|9106|[深信服真的每天加班到 11 点吗](https://www.v2ex.com/t/525495)| -|深圳|[华为](https://www.huawei.com/cn/)|2010年8月|9106|[华为：“自愿”的奋斗者协议](http://focus.news.163.com/10/0921/15/6H460OOP00011SM9.html)| |广州|[鲸鱼游戏](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)| @@ -50,11 +52,9 @@ |北京|[高伟达](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月|大小周、
加班、裁员|[如何看待跨越速运的裁员方式？ - 知乎](https://www.zhihu.com/question/312825261)| -|上海|[拼多多](https://www.pinduoduo.com//)|2019年2月|11116、两班倒|[996还不敷，拼多多又玩两班倒，员工大喊：比富士康还狠](http://www.taobao92.com/thread-1313-1-1.html)| |上海|[砸立](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)| -|深圳|[大疆创新](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)| |杭州|[同花顺](http://www.10jqka.com.cn/)|2018年12月|大小周、加班|[看准](https://www.kanzhun.com/pl6896401.html)| |上海|[游族网络](https://www.youzu.com/)|2018年3月|996|[你为什么从游族离职?-知乎](https://www.zhihu.com/question/22411680?sort=created)|-| From bac20dc089e30aedf17537487d8b4411409e73a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=85=A7=E6=AD=A6?= Date: Mon, 1 Apr 2019 20:47:53 +0800 Subject: [PATCH 06/17] Unified logo size --- awesomelist/projects.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awesomelist/projects.md b/awesomelist/projects.md index a654314..bb944ca 100644 --- a/awesomelist/projects.md +++ b/awesomelist/projects.md @@ -17,6 +17,6 @@ Projects under 996ICU License. Thanks for your support! | | [app_server](https://github.com/wildfirechat/app_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，应用服务 | | | [robot_server](https://github.com/wildfirechat/robot_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，机器人服务 | | - | [WeChatBlog](https://github.com/NiZerin/WeChatBlog) |[NiZerin](https://github.com/NiZerin)| 微信小程序 & 个人博客 & WordPress REST API | -| ![](https://github.com/cookieY/Yearning/blob/master/logo.png) | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 | +| | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 | | | [You-need-to-know-css](https://github.com/l-hammer/You-need-to-know-css) |[-](https://lhammer.cn/You-need-to-know-css)| 💄CSS tricks for web developers~ | From 123c5924866f67c7435f88cdf52b3105207207f7 Mon Sep 17 00:00:00 2001 From: MingZZX <41257880+mzzx@users.noreply.github.com> Date: Mon, 1 Apr 2019 21:15:33 +0800 Subject: [PATCH 07/17] Update README.md --- README.md | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 92783a7..bf78d89 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ 996.ICU ======= + 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). [![Slack](https://img.shields.io/badge/slack-996ICU-%23de335e.svg)](https://join.slack.com/t/996icu/shared_invite/enQtNTc5MTU4MDkxOTA1LTJlYWVmMGQxOWNjZDA2NzdkMzQ3MjkzYmFlYTAxMTczZGQ0NmQ5ZWY5MTVjODQ4MWFkZGRhMmRmY2UwZGUyOTQ) @@ -14,12 +15,16 @@ Repo for counting stars and contributing. Press F to pay your respect 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 in popularity. Serving a company that encourages the "996" work schedule usually means working for at least 60 hours per week. +***** + +“996”工作制，指的是一种越来越流行的非官方工作制（早上 9 点 ~ 晚上 9 点，每周 6 天）。在一个实行“996”工作制的公司工作就意味着每周至少要工作 60 个小时。 + 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). @@ -28,10 +33,11 @@ What can I do? - 更新这个[名单](blacklist/blacklist.md)（附带证据），来帮助每一位工作者。 - 把这个[徽章](externals/instruction.md)加入你的项目来支持996.ICU -- 为您的项目添加[996ICU License](LICENSE_CN)。 +- 为您的项目添加[反 996 许可证](LICENSE_CN)。 Principles and purposes --- + * 996.ICU is an initiative initiated by IT practitioners. We welcome people from other fields and other countries to join the discussion. * This is not a political movement. We firmly uphold the labor law and require employers to respect the legitimate rights and interests of their employees. @@ -40,7 +46,7 @@ Principles and purposes * We are willing to hear all positive and constructive proposals and advocate for mature and responsible speech. -* We are working on the drafting of 996ICU License right now and we hope to get help from professionals with relevant experience. +* We are working on the drafting of Anti-996 License right now and we hope to get help from professionals with relevant experience. ***** @@ -52,12 +58,17 @@ Principles and purposes * 我们欢迎一切积极的、具有建设性意义的建议，倡导成熟的、负责任的发言。 -* 目前 996ICU License 处于起草阶段，希望有相关经验的专业人士能给予帮助。 +* 目前反 996 许可证还处于起草阶段，希望有相关经验的专业人士能给予帮助。 Expand influence --- + [Translations of 996.ICU's contents](i18n/i18n.md), feel free to adjust the format, add some contents or fix grammatical errors. Please note that adding too many translations is getting off the track. +***** + +[996.ICU 内容翻译](i18n/i18n.md)，请自由发挥你的能力，调整格式、添加内容或修正语法。不过要注意，添加过多的翻译版本并非我们的目标。 + Community powers --- @@ -71,20 +82,34 @@ Community powers Where are the issues? --- -Even with interaction limits on, the issue area was totally out of control. + +Even with interaction limits on, the issues area was totally out of control. So I **personally** decided to switch it off, not by GitHub or others. +***** + +即使有互动限制，issues 区依然完全失去了控制。 +因此我**个人**决定关闭 issues，这与 GitHub 或其他方面无关。 + License --- + [Anti-996 License](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 996ICU License + - 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) - 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 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 [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft). Thank you. +***** +[反 996 许可证](LICENSE) - + - 此许可证的目的是阻止违反劳动法的公司使用许可证下的软件或代码，并强迫这些公司权衡他们的行为。 + - 在此处查看反 996 许可证下的[完整项目列表](awesomelist/projects.md) + - 此许可证的灵感来源于 @xushunke：[Design A Software License Of Labor Protection -- 996ICU License](https://github.com/996icu/996.ICU/pull/15642) + - 当前版本反 996 许可证由 [伊利诺伊大学法学院的 Katt Gu, J.D](https://scholar.google.com.sg/citations?user=PTcpQwcAAAAJ&hl=en&oi=ao) 起草；由 [Dimension](https://www.dimension.im) 的首席执行官 [Suji Yan](https://www.linkedin.com/in/tedkoyan/) 提供建议。 + - 该草案改编自 MIT 许可证，如需更多信息请查看 [Wiki](https://github.com/kattgu7/996-License-Draft/wiki)。此许可证旨在与所有主流开源许可证兼容。 + - 如果你是法律专业人士，或是任何愿意为未来版本做出直接贡献的人，请访问 [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft)。感谢你的帮助。 From 717e930c480ff1d118058af35cd8fc4fa7dca383 Mon Sep 17 00:00:00 2001 From: "jinlong.hao" Date: Mon, 1 Apr 2019 21:23:48 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20eppdev-jee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- awesomelist/projects.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awesomelist/projects.md b/awesomelist/projects.md index d84503f..4c93120 100644 --- a/awesomelist/projects.md +++ b/awesomelist/projects.md @@ -18,3 +18,5 @@ Projects under 996ICU License. Thanks for your support! | | [robot_server](https://github.com/wildfirechat/robot_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，机器人服务 | | - | [WeChatBlog](https://github.com/NiZerin/WeChatBlog) |[NiZerin](https://github.com/NiZerin)| 微信小程序 & 个人博客 & WordPress REST API | | ![](https://github.com/cookieY/Yearning/blob/master/logo.png) | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 | +| - | [eppdev-jee-pom](https://github.com/eppdev/eppdev-jee-pom) | https://jee.eppdev.cn | 数据驱动的JavaEE代码生成程序 | + From bddcd5b7a63bb2e71b1061fdc4608d399368f750 Mon Sep 17 00:00:00 2001 From: maguowei Date: Mon, 1 Apr 2019 21:38:20 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E9=80=82=E4=BF=9D=E7=95=99=E7=9A=84=E6=8F=8F=E8=BF=B0=E6=96=87?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- whitelist/whitelist.md | 1 - 1 file changed, 1 deletion(-) diff --git a/whitelist/whitelist.md b/whitelist/whitelist.md index edb9440..f2db0c8 100644 --- a/whitelist/whitelist.md +++ b/whitelist/whitelist.md @@ -1,6 +1,5 @@ 965良好工作制度公司名单 === -本来想单独创建965.healthy仓库的，但是.healthy只能850/年，小可怜买不起。所以恳请996的大佬们让宝宝蹭下热度吧，也传播点正能量。 贡献指南 --- From fa67c744d767a13c3de7d050a0abb5a15addc2c1 Mon Sep 17 00:00:00 2001 From: milo Date: Mon, 1 Apr 2019 22:05:51 +0800 Subject: [PATCH 10/17] update projects.md --- awesomelist/projects.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awesomelist/projects.md b/awesomelist/projects.md index d84503f..56ded49 100644 --- a/awesomelist/projects.md +++ b/awesomelist/projects.md @@ -18,3 +18,5 @@ Projects under 996ICU License. Thanks for your support! | | [robot_server](https://github.com/wildfirechat/robot_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，机器人服务 | | - | [WeChatBlog](https://github.com/NiZerin/WeChatBlog) |[NiZerin](https://github.com/NiZerin)| 微信小程序 & 个人博客 & WordPress REST API | | ![](https://github.com/cookieY/Yearning/blob/master/logo.png) | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 | +| - | [mina-gulp-cli](https://github.com/milobluebell/mina-gulp-cli) | https://github.com/milobluebell/mina-gulp-cli | 一个轻量级的小程序开发脚手架，基于gulp +| - | [aya-store](https://github.com/milobluebell/aya-store) | https://github.com/milobluebell/aya-store | 小程序状态管理模块 \ No newline at end of file From 8effebfee4022665d055f07cbd2b2a768f3b4e81 Mon Sep 17 00:00:00 2001 From: TommyLemon Date: Mon, 1 Apr 2019 22:34:53 +0800 Subject: [PATCH 11/17] Update projects.md --- awesomelist/projects.md | 1 + 1 file changed, 1 insertion(+) diff --git a/awesomelist/projects.md b/awesomelist/projects.md index d84503f..27d0404 100644 --- a/awesomelist/projects.md +++ b/awesomelist/projects.md @@ -18,3 +18,4 @@ Projects under 996ICU License. Thanks for your support! | | [robot_server](https://github.com/wildfirechat/robot_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，机器人服务 | | - | [WeChatBlog](https://github.com/NiZerin/WeChatBlog) |[NiZerin](https://github.com/NiZerin)| 微信小程序 & 个人博客 & WordPress REST API | | ![](https://github.com/cookieY/Yearning/blob/master/logo.png) | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 | +| ![](https://raw.githubusercontent.com/TommyLemon/APIJSON/master/logo.png) | [APIJSON](https://github.com/TommyLemon/APIJSON) |[APIJSON.org](http://apijson.org/)| trophy码云最有价值开源项目
后端接口和文档自动化，前端(客户端) 定制返回JSON的数据和结构！ | From beb44a70db4cbf6408c076f597e4bc10a6157fe0 Mon Sep 17 00:00:00 2001 From: TommyLemon Date: Mon, 1 Apr 2019 22:35:40 +0800 Subject: [PATCH 12/17] Update projects.md --- awesomelist/projects.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awesomelist/projects.md b/awesomelist/projects.md index 27d0404..9bc620e 100644 --- a/awesomelist/projects.md +++ b/awesomelist/projects.md @@ -18,4 +18,4 @@ Projects under 996ICU License. Thanks for your support! | | [robot_server](https://github.com/wildfirechat/robot_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，机器人服务 | | - | [WeChatBlog](https://github.com/NiZerin/WeChatBlog) |[NiZerin](https://github.com/NiZerin)| 微信小程序 & 个人博客 & WordPress REST API | | ![](https://github.com/cookieY/Yearning/blob/master/logo.png) | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 | -| ![](https://raw.githubusercontent.com/TommyLemon/APIJSON/master/logo.png) | [APIJSON](https://github.com/TommyLemon/APIJSON) |[APIJSON.org](http://apijson.org/)| trophy码云最有价值开源项目
后端接口和文档自动化，前端(客户端) 定制返回JSON的数据和结构！ | +| ![](https://raw.githubusercontent.com/TommyLemon/APIJSON/master/logo.png) | [APIJSON](https://github.com/TommyLemon/APIJSON) |[APIJSON.org](http://apijson.org/)| 🏆码云最有价值开源项目
🚀后端接口和文档自动化，前端(客户端) 定制返回JSON的数据和结构！ | From 287fe14e0610857dd9223703081670195611e6ba Mon Sep 17 00:00:00 2001 From: TommyLemon Date: Mon, 1 Apr 2019 22:36:24 +0800 Subject: [PATCH 13/17] Update projects.md --- awesomelist/projects.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awesomelist/projects.md b/awesomelist/projects.md index 9bc620e..9c432de 100644 --- a/awesomelist/projects.md +++ b/awesomelist/projects.md @@ -18,4 +18,4 @@ Projects under 996ICU License. Thanks for your support! | | [robot_server](https://github.com/wildfirechat/robot_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案，机器人服务 | | - | [WeChatBlog](https://github.com/NiZerin/WeChatBlog) |[NiZerin](https://github.com/NiZerin)| 微信小程序 & 个人博客 & WordPress REST API | | ![](https://github.com/cookieY/Yearning/blob/master/logo.png) | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 | -| ![](https://raw.githubusercontent.com/TommyLemon/APIJSON/master/logo.png) | [APIJSON](https://github.com/TommyLemon/APIJSON) |[APIJSON.org](http://apijson.org/)| 🏆码云最有价值开源项目
🚀后端接口和文档自动化，前端(客户端) 定制返回JSON的数据和结构！ | +| ![](https://raw.githubusercontent.com/TommyLemon/APIJSON/master/logo.png) | [APIJSON](https://github.com/TommyLemon/APIJSON) |[APIJSON.org](http://apijson.org/)| 🏆码云最有价值开源项目
🚀自动化接口和文档 ORM 库：后端接口和文档自动化，前端(客户端) 定制返回JSON的数据和结构！ | From 6f787c5d02e5830e9cdd05b6c9b327797dbd074b Mon Sep 17 00:00:00 2001 From: Katt Gu Date: Mon, 1 Apr 2019 22:57:30 +0800 Subject: [PATCH 14/17] Update LICENSE_CN --- LICENSE_CN | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/LICENSE_CN b/LICENSE_CN index bec96d6..e43a4d0 100644 --- a/LICENSE_CN +++ b/LICENSE_CN @@ -1,12 +1,24 @@ 版权所有（c）<年份><版权持有人> -反996许可证版本1.0（草稿） +反996许可证版本1.0 -在符合下列条件的情况下，特此免费向任何得到本授权作品的副本（包括源代码、文件和/或相关内容，以下统称为“授权作品”）的个人和法人实体授权：被授权个人或法人实体有权以任何目的处置授权作品，包括但不限于使用、复制，修改，衍生利用、散布，发布和再许可： +在符合下列条件的情况下，特此免费向任何得到本授权作品的副本（包括源代码、文件和/或相关内容，以下 +统称为“授权作品”）的个人和法人实体授权：被授权个人或法人实体有权以任何目的处置授权作品，包括但 +不限于使用、复制，修改，衍生利用、散布，发布和再许可： -1. 个人或法人实体必须在许可作品的每个再散布或衍生副本上包含以上版权声明和本许可证，不得自行修改。 -2. 个人或法人实体必须严格遵守与个人实际所在地或个人出生地或归化地、或法人实体注册地或经营地（以较严格者为准）的司法管辖区所有适用的与劳动和就业相关法律、法规、规则和标准。如果该司法管辖区没有此类法律、法规、规章和标准或其法律、法规、规章和标准不可执行，则个人或法人实体必须遵守国际劳工标准的核心公约。 -3. 个人或法人不得以任何方式诱导或强迫其全职或兼职员工或其独立承包人以口头或书面形式同意直接或间接限制、削弱或放弃其所拥有的，受相关与劳动和就业有关的法律、法规、规则和标准保护的权利或补救措施，无论该等书面或口头协议是否被该司法管辖区的法律所承认，该等个人或法人实体也不得以任何方法限制其雇员或独立承包人向版权持有人或监督许可证合规情况的有关当局报告或投诉上述违反许可证的行为的权利。 +1. 个人或法人实体必须在许可作品的每个再散布或衍生副本上包含以上版权声明和本许可证，不得自行修 +改。 +2. 个人或法人实体必须严格遵守与个人实际所在地或个人出生地或归化地、或法人实体注册地或经营地 +（以较严格者为准）的司法管辖区所有适用的与劳动和就业相关法律、法规、规则和标准。如果该司法管辖 +区没有此类法律、法规、规章和标准或其法律、法规、规章和标准不可执行，则个人或法人实体必须遵守国 +际劳工标准的核心公约。 +3. 个人或法人不得以任何方式诱导或强迫其全职或兼职员工或其独立承包人以口头或书面形式同意直接或 +间接限制、削弱或放弃其所拥有的，受相关与劳动和就业有关的法律、法规、规则和标准保护的权利或补救 +措施，无论该等书面或口头协议是否被该司法管辖区的法律所承认，该等个人或法人实体也不得以任何方法 +限制其雇员或独立承包人向版权持有人或监督许可证合规情况的有关当局报告或投诉上述违反许可证的行为 +的权利。 -该授权作品是"按原样"提供，不做任何明示或暗示的保证，包括但不限于对适销性、特定用途适用性和非侵权性的保证。在任何情况下，无论是在合同诉讼、侵权诉讼或其他诉讼中，版权持有人均不承担因本软件或本软件的使用或其他交易而产生、引起或与之相关的任何索赔、损害或其他责任。 +该授权作品是"按原样"提供，不做任何明示或暗示的保证，包括但不限于对适销性、特定用途适用性和非侵 +权性的保证。在任何情况下，无论是在合同诉讼、侵权诉讼或其他诉讼中，版权持有人均不承担因本软件或 +本软件的使用或其他交易而产生、引起或与之相关的任何索赔、损害或其他责任。 From a0f3bbc161a388442164853cf4b3006fd2597c6b Mon Sep 17 00:00:00 2001 From: 996icu <48942249+996icu@users.noreply.github.com> Date: Mon, 1 Apr 2019 23:18:19 +0800 Subject: [PATCH 15/17] Update projects.md --- awesomelist/projects.md | 1 + 1 file changed, 1 insertion(+) diff --git a/awesomelist/projects.md b/awesomelist/projects.md index 36cca8e..cac37ca 100644 --- a/awesomelist/projects.md +++ b/awesomelist/projects.md @@ -26,3 +26,4 @@ Projects under 996ICU License. Thanks for your support! | - | [eppdev-jee-pom](https://github.com/eppdev/eppdev-jee-pom) | https://jee.eppdev.cn | 数据驱动的JavaEE代码生成程序 | | | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 | | | [You-need-to-know-css](https://github.com/l-hammer/You-need-to-know-css) |[-](https://lhammer.cn/You-need-to-know-css)| 💄CSS tricks for web developers~ | +| - | [Android-KlineChar](https://github.com/icechao/kline) |[icechao](https://github.com/icechao)| 安卓高仿火币,快速实现K线功能的lib | From d1467bd6980cd50624a2f5103672e9fd682eeef4 Mon Sep 17 00:00:00 2001 From: 996icu <48942249+996icu@users.noreply.github.com> Date: Mon, 1 Apr 2019 23:33:03 +0800 Subject: [PATCH 16/17] Update blacklist.md --- blacklist/blacklist.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blacklist/blacklist.md b/blacklist/blacklist.md index ea3452b..f3dc7dc 100644 --- a/blacklist/blacklist.md +++ b/blacklist/blacklist.md @@ -1,3 +1,5 @@ +**请注意：维护本列表的目的在于为《中华人民共和国劳动法》的执行提供参考依据。** + 996（或其他违法加班制度）公司名单 === 违法加班制度是指有证据证明的违反相关法律法规及劳动合同，未经与工会和劳动者协商便强制加班加点，或加班加点超出法定时限（每日超过三小时或每月超过三十六小时），或未足额支付加班加点工资报酬的非法用工制度。 From f170fc3c7321432de628798172ea2135d9ff9d33 Mon Sep 17 00:00:00 2001 From: eux Date: Mon, 1 Apr 2019 23:30:02 +0800 Subject: [PATCH 17/17] Adjust words format in README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bf78d89..e7b4dbf 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ What can I do? ***** - 更新这个[名单](blacklist/blacklist.md)（附带证据），来帮助每一位工作者。 -- 把这个[徽章](externals/instruction.md)加入你的项目来支持996.ICU +- 把这个[徽章](externals/instruction.md)加入你的项目来支持 996.ICU - 为您的项目添加[反 996 许可证](LICENSE_CN)。 Principles and purposes @@ -50,7 +50,7 @@ Principles and purposes ***** -* 996.ICU 是IT从业者发起的一项倡议，我们欢迎其他领域、其他国家的人士加入讨论。 +* 996.ICU 是 IT 从业者发起的一项倡议，我们欢迎其他领域、其他国家的人士加入讨论。 * 这并不是一个政治运动，我们坚定维护劳动法，我们要求雇主尊重雇员的合法权益。 @@ -96,10 +96,10 @@ License [Anti-996 License](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 + - 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) - - 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 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 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 [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft). Thank you.