Merge remote-tracking branch 'upstream/master'

* upstream/master:
  dura项目补充
  新增支持项目
  Update blacklist.md
  Update README.md
This commit is contained in:
宋慧武
2019-04-01 20:42:49 +08:00
3 changed files with 20 additions and 20 deletions

View File

@ -22,13 +22,15 @@ What can I do?
- Update this [list](blacklist/blacklist.md) with evidence to help every worker. - 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. - Add this [badge](externals/instruction.md) to your project to support 996.ICU.
- License your awesome projects with the 996ICU License. - License your awesome projects with the [996ICU License](LICENSE).
---
*****
- 更新这个[名单](blacklist/blacklist.md)(附带证据),来帮助每一位工作者。 - 更新这个[名单](blacklist/blacklist.md)(附带证据),来帮助每一位工作者。
- 把这个[徽章](externals/instruction.md)加入你的项目来支持996.ICU - 把这个[徽章](externals/instruction.md)加入你的项目来支持996.ICU
- 为您的项目添加996ICU License。 - 为您的项目添加[996ICU License](LICENSE_CN)
The principle and purpose of this repository! 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. * 996.ICU is an initiative initiated by IT practitioners. We welcome people from other fields and other countries to join the discussion.
@ -74,19 +76,15 @@ So I **personally** decided to switch it off, not by GitHub or others.
License License
--- ---
[Anti 996 License](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
- 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.
- 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 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.
Awesome projects under 996ICU License:
---
[See a full list of projects under 996ICU License](awesomelist/projects.md).

View File

@ -4,7 +4,7 @@ Projects under 996ICU License. Thanks for your support!
|LOGO|项目|官网|简介| |LOGO|项目|官网|简介|
|:---:|:---|:---|:---| |:---:|:---|:---|:---|
|-| [dura](https://github.com/CN-YUANYU/dura) |-| 基于 redux、typescript 的前端数据流方案 | | <img src="https://github.com/CN-YUANYU/dura/blob/master/image/logo.png?raw=true" width="60"> | [dura](https://github.com/CN-YUANYU/dura) | https://github.com/CN-YUANYU/dura | 基于 redux、typescript 的前端数据流方案 |
| - | [vue-apis](https://github.com/ChangedenCZD/vue-apis) |[ChangedenCZD](https://github.com/ChangedenCZD)| 集成axios的vue插件 | | - | [vue-apis](https://github.com/ChangedenCZD/vue-apis) |[ChangedenCZD](https://github.com/ChangedenCZD)| 集成axios的vue插件 |
| - | [optimize-vue](https://github.com/ChangedenCZD/optimize-vue) |[ChangedenCZD](https://github.com/ChangedenCZD)| 基于 vue-cli 3.0 构建的快速开发框架 | | - | [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 构建的快速开发框架的脚手架 | | - | [optimize-vue-cli](https://github.com/ChangedenCZD/optimize-vue-cli) |[ChangedenCZD](https://github.com/ChangedenCZD)| 基于 vue-cli 3.0 构建的快速开发框架的脚手架 |
@ -17,4 +17,6 @@ Projects under 996ICU License. Thanks for your support!
| | [app_server](https://github.com/wildfirechat/app_server) |[wildfirechat](http://docs.wildfirechat.cn/)| 野火IM解决方案应用服务 | | | [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解决方案机器人服务 | | | [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 |
| ![](https://github.com/cookieY/Yearning/blob/master/logo.png) | [Yearning](https://github.com/cookieY/Yearning) |[cookieY](https://github.com/cookieY)| Mysql SQL审核平台 |
| <img src="https://github.com/l-hammer/You-need-to-know-css/raw/master/static/logo.png" width="60"> | [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~ | | <img src="https://github.com/l-hammer/You-need-to-know-css/raw/master/static/logo.png" width="60"> | [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~ |

View File

@ -27,7 +27,7 @@
名单列表 名单列表
--- ---
|城市|公司|曝光时间|制度描述|证据内容| |所在城市|公司名字|曝光时间|制度描述|证据内容|
|:---:|:---:|:---:|:---:|:---:| |:---:|:---:|:---:|:---:|:---:|
|北京|[58同城](https://www.58.com)|2016年9月|996|[58同城实行全员996工作制 被指意图逼员工主动辞职](http://finance.cnr.cn/gs/20160901/t20160901_523105136.shtml)| |北京|[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.youzan.com)|2019年1月|996|[年会成了“鸿门宴”这家公司“强制996”被员工举报](http://www.linkshop.com.cn/web/archives/2019/418163.shtml)|