From c68fe28f3a0013e2012ad37521e676df236e967a Mon Sep 17 00:00:00 2001 From: fengshenyuan Date: Sun, 31 Mar 2019 11:27:43 +0800 Subject: [PATCH 1/7] add the proposal template file --- proposal/proposal_template.md | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 proposal/proposal_template.md diff --git a/proposal/proposal_template.md b/proposal/proposal_template.md new file mode 100644 index 0000000..0f731f3 --- /dev/null +++ b/proposal/proposal_template.md @@ -0,0 +1,52 @@ +# Proposal Template for 996.icu Projects + +HEAD | SUMMARY +-|-|- +Title:| Proposal Template for 996.icu Projects +Author:| xiao +Status:| Draft +Type:| Template +Created:| 31-Mar-2019 +Post-History:| None + +## Why this Proposal? + +I write this template for the whole community.
+Hope we can record useful and valuable suggestions and make they true. + +## Community Value + +Provide a template for new proposals.
+A proposal can be used to record suggestions and aggrements.
+It's better for community members to understand and review what import decisions has been made and discussed. + +## Problems + +In this part, the proposer should describle what problems we are facing.
+For example, currently, we don't have a way to record import decisions and suggestions.
+Pull Requests area is too general and not a good way to express ideas.
+We need a much more formal channel. + +## Solutions + +In this part, the proposer should statement the solutions or proposals to solve this problems listed in *Problems* part.
+For example, we add the proposal directory in the repo and init this proposal template to help the community to build a much more formal channel for suggestion and discussion. + +## Resource & Requirements + +In this part, list out the resource or other requirements required by the proposal or solution. + +## Actions & implementation Plan + +In this part, the proposer should describle the actions and implementation plan after the proposal is approved by the community. + +## References + +In the part, list out links to the reference resource. +For example, for this proposal the main reference is
+- [PEP 1 -- PEP Purpose and Guidelines](https://www.python.org/dev/peps/pep-0001/) + +## Copyright + +This document has been placed in the public domain.
+*996.ICU Project All Right Reserved 2019* From 46700a5e7e3344dea35e631b07b089350daa3da8 Mon Sep 17 00:00:00 2001 From: fengshenyuan Date: Sun, 31 Mar 2019 11:34:58 +0800 Subject: [PATCH 2/7] adjust format and style --- proposal/proposal_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proposal/proposal_template.md b/proposal/proposal_template.md index 0f731f3..03329b2 100644 --- a/proposal/proposal_template.md +++ b/proposal/proposal_template.md @@ -29,7 +29,7 @@ We need a much more formal channel. ## Solutions -In this part, the proposer should statement the solutions or proposals to solve this problems listed in *Problems* part.
+In this part, the proposer should statement the solutions or proposals to solve this problems listed in ***Problems*** part.
For example, we add the proposal directory in the repo and init this proposal template to help the community to build a much more formal channel for suggestion and discussion. ## Resource & Requirements @@ -49,4 +49,4 @@ For example, for this proposal the main reference is
## Copyright This document has been placed in the public domain.
-*996.ICU Project All Right Reserved 2019* +***996.ICU Project All Right Reserved 2019*** From 35a39189957d38d12bd7969880cba633500bc258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=83=8F=E9=A3=8E=E4=B8=80=E6=A0=B7=E8=87=AA=E7=94=B1?= <1663177102@qq.com> Date: Sun, 31 Mar 2019 12:12:25 +0800 Subject: [PATCH 3/7] Update blacklist.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 怎么没有外包上榜 --- blacklist/blacklist.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blacklist/blacklist.md b/blacklist/blacklist.md index 79a2ecf..365e765 100644 --- a/blacklist/blacklist.md +++ b/blacklist/blacklist.md @@ -44,3 +44,5 @@ |上海|[盛赫游戏](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)| |深圳|[跨越速运](http://www.ky-express.com/)|2018年8月|大小周、加班、裁员|[如何看待跨越速运的裁员方式？ - 知乎](https://www.zhihu.com/question/312825261)| +|深圳|[华为外包](https://www.kanzhun.com/gsr1439970.html)|2018年3月|大小周、加班、裁员|[华为外包是怎样的体验?？ - 知乎](https://www.zhihu.com/question/28517881)| + From 11124c64bde4d51453c148c0bf8d68093a421d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=83=8F=E9=A3=8E=E4=B8=80=E6=A0=B7=E8=87=AA=E7=94=B1?= <1663177102@qq.com> Date: Sun, 31 Mar 2019 12:13:20 +0800 Subject: [PATCH 4/7] 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 365e765..4fd22e6 100644 --- a/blacklist/blacklist.md +++ b/blacklist/blacklist.md @@ -44,5 +44,5 @@ |上海|[盛赫游戏](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)| |深圳|[跨越速运](http://www.ky-express.com/)|2018年8月|大小周、加班、裁员|[如何看待跨越速运的裁员方式？ - 知乎](https://www.zhihu.com/question/312825261)| -|深圳|[华为外包](https://www.kanzhun.com/gsr1439970.html)|2018年3月|大小周、加班、裁员|[华为外包是怎样的体验?？ - 知乎](https://www.zhihu.com/question/28517881)| +|深圳|[华为外包](https://www.kanzhun.com/gsr1439970.html)|2018年3月|大小周、加班、裁员|[华为外包是怎样的体验？ - 知乎](https://www.zhihu.com/question/28517881)| From 18bb8b9e547ce3a664b99defd6d35cad685fb9b4 Mon Sep 17 00:00:00 2001 From: yyrdl Date: Sun, 31 Mar 2019 12:38:40 +0800 Subject: [PATCH 5/7] update the translation of 'principle and purpose' --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8cae6a7..9dde39d 100644 --- a/README.md +++ b/README.md @@ -27,15 +27,15 @@ What can I do? The principle and purpose Of this repository! --- -* this is not a politic activity,we are the staunch supporters of labour law. we ask employers to respect the legitimate rights and interests of employees. +* 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. -* From closed source to open source is a great progress, from open source to emphasizing the protection of labor rights and interests at the same time will also be an another great progress. We want to create an open source software license that protects workers' rights and interests. +* 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 welcome all positive and constructive suggestions and advocate mature and responsible speeches. +* We are willing to hear all positive and constructive proposals and advocate for mature and responsible speech. -* 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 of IT practitioners and we welcome people from other fields and countries to join the discussion. -* At present, 996 ICU License is immature, we hope professionals with relevant experience can help. +* At present, the 996ICU License is not very mature. I hope professionals with relevant experience can offer some help. ***** From 11fc33475ac227166fc802e659fd6d47b3e6412e Mon Sep 17 00:00:00 2001 From: Fei Chong Date: Sun, 31 Mar 2019 13:03:48 +0800 Subject: [PATCH 6/7] Add instruction for how to use multi-licensing --- externals/instruction.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/externals/instruction.md b/externals/instruction.md index 8527a91..fa3472b 100644 --- a/externals/instruction.md +++ b/externals/instruction.md @@ -12,3 +12,24 @@ or equivalent Markdown code [![996.icu](https://img.shields.io/badge/link-996.icu-red.svg)](https://996.icu) ``` 996.icu + +Add License +--- +#### Budget +Markdown code for badget： +```markdown +[![LICENSE](https://img.shields.io/badge/license-NPL%20(The%20996%20Prohibited%20License)-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE) +``` +[![LICENSE](https://img.shields.io/badge/license-NPL%20(The%20996%20Prohibited%20License)-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE) + +#### License file +The 996ICU license is designed for multi-licensing, you can use it with other licenses like MIT in these ways: +- Separate license files: + - In `LICENSE` file, list all licenses you used. + - Add `LICENSE.996ICU` or `LINCES.NPL` file for details of 996ICU license. + - Add `LINCESE.MIT` file for details of MIT license. +- Single lincense files: + - Add primary license content, such as MIT license. + - Add separation line like `----------`. + - Add 996ICU license content. + From f0780d4c2cd401f9a891d4c73aac47d73573ec61 Mon Sep 17 00:00:00 2001 From: Fei Chong Date: Sun, 31 Mar 2019 13:19:27 +0800 Subject: [PATCH 7/7] Fix typo --- externals/instruction.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/externals/instruction.md b/externals/instruction.md index fa3472b..f60a8a2 100644 --- a/externals/instruction.md +++ b/externals/instruction.md @@ -25,10 +25,10 @@ Markdown code for badget： #### License file The 996ICU license is designed for multi-licensing, you can use it with other licenses like MIT in these ways: - Separate license files: - - In `LICENSE` file, list all licenses you used. + - In `LICENSE` file, list all licenses you used with `AND`. - Add `LICENSE.996ICU` or `LINCES.NPL` file for details of 996ICU license. - Add `LINCESE.MIT` file for details of MIT license. -- Single lincense files: +- Single license files: - Add primary license content, such as MIT license. - Add separation line like `----------`. - Add 996ICU license content.