From 4d70534af2538de23df4494cc49202747a49c4cb Mon Sep 17 00:00:00 2001 From: sujiyan Date: Mon, 1 Apr 2019 17:45:40 +0800 Subject: [PATCH] Solve conflict --- README.md | 24 ++++++++++++++++-------- awesomelist/projects.md | 10 ++++++++++ blacklist/blacklist.md | 5 +++++ 3 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 awesomelist/projects.md diff --git a/README.md b/README.md index 0d989a0..eb8e4f2 100644 --- a/README.md +++ b/README.md @@ -19,18 +19,20 @@ A "996" work schedule refers to an unofficial work schedule (9 a.m. ~ 9 p.m., 6 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. +- 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. --- - 更新这个[名单](blacklist/blacklist.md)（附带证据），来帮助每一位工作者。 - 把这个[徽章](externals/instruction.md)加入你的项目来支持996.ICU +- 为您的项目添加996ICU License。 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. * 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. - + * It is a great progress from closed source to open source, and it will also be a great progress from open source to emphasize labor rights at the same time. What we want is to create an open source software license that advocates for workers' rights. * We are willing to hear all positive and constructive proposals and advocate for mature and responsible speech. @@ -66,17 +68,23 @@ 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 issue area was totally out of control. So I **personally** decided to switch it off, not by GitHub or others. 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 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. + - 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-Draft](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). + diff --git a/awesomelist/projects.md b/awesomelist/projects.md new file mode 100644 index 0000000..d5c7198 --- /dev/null +++ b/awesomelist/projects.md @@ -0,0 +1,10 @@ +Projects under 996ICU License. Thanks for your support! +=== +无论大小，从我做起，贡献出一份属于自己的力量。已加入 996 License 项目列表，欢迎随时补充。 + +|LOGO|项目|官网|简介| +|:---:|:---|:---|:---| +|-| [dura](https://github.com/CN-YUANYU/dura) |-| 基于 redux、typescript 的前端数据流方案 | +| - | [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-cli](https://github.com/ChangedenCZD/optimize-vue-cli) |[ChangedenCZD](https://github.com/ChangedenCZD)| 基于 vue-cli 3.0 构建的快速开发框架的脚手架 | diff --git a/blacklist/blacklist.md b/blacklist/blacklist.md index ba190e7..5d9c6a3 100644 --- a/blacklist/blacklist.md +++ b/blacklist/blacklist.md @@ -61,3 +61,8 @@ |北京|[北京霁云科技](https://xin.baidu.com/detail/compinfo?pid=xlTM-TogKuTwdr2zNtf0Zpjhxx2gQd9FZQmd&from=ps)|2019年3月|996|[boss直聘](https://www.zhipin.com/gongsi/2c08264377f4a5c61nx739i-Fw~~.html?ka=search_rcmd_company_2c08264377f4a5c61nx739i-Fw~~)| |广州|[多益网络](https://www.duoyi.com)|2018年3月|9106|[看准](https://www.kanzhun.com/gsr1365983tl56.html)、[知乎](https://www.zhihu.com/question/22713470/answer/145287600)| + + +更多黑名单 +--- +[shengxinjing/programmer-job-blacklist](https://github.com/shengxinjing/programmer-job-blacklist)