Merge branch 'master' into master
This commit is contained in:
Bofei Wang
GitHub
@ -28,12 +28,12 @@ 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 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 would like 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 are willing to hear all positive and constructive proposals and advocate for mature and responsible speech.
|
||||
|
||||
* We welcome all positive and constructive suggestions and advocate mature and responsible speeches.
|
||||
|
||||
* We are working on the drafting of 996 License right now and we hope to get help from professionals with relevant experience.
|
||||
|
||||
*****
|
||||
|
||||
@ -45,10 +45,11 @@
|
||||
|广州|[鲸鱼游戏](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)|
|
||||
|深圳|[华为外包](https://www.kanzhun.com/gsr1439970.html)|2018年3月|大小周、加班、裁员|[华为外包是怎样的体验？ - 知乎](https://www.zhihu.com/question/28517881)|
|
||||
|深圳|[跨越速运](http://www.ky-express.com/)|2018年8月|大小周、<br>加班、裁员|[如何看待跨越速运的裁员方式？ - 知乎](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)|-|
|
||||
|上海|[砸立](https://m.eyee.com/)|2019年1月|996|[看准](https://www.kanzhun.com/gsr5728610tl526.html?ka=review-label2)|
|
||||
|武汉|[武汉氪细胞](http://www.timing360.com/)|2019年3月|996|名义上996，实际下班时间更晚<br>[考勤日历](img/timing360-0823.jpg)<br>[考勤规则](img/timing360-1201.jpg)|
|
||||
|杭州|[一喂智能科技](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)
|
||||
|深圳|[大疆创新](https://www.dji.com/cn)|2018年12月|996|[程序员猝死之后大疆称无加班文化 离职员工怒了](https://baijiahao.baidu.com/s?id=1619909152168711034&wfr=spider&for=pc)|
|
||||
|
||||
21
externals/instruction.md
vendored
21
externals/instruction.md
vendored
@ -12,3 +12,24 @@ or equivalent Markdown code
|
||||
[](https://996.icu)
|
||||
```
|
||||
<a href="https://996.icu"><img src="https://img.shields.io/badge/link-996.icu-red.svg" alt="996.icu"></a>
|
||||
|
||||
Add License
|
||||
---
|
||||
#### Budget
|
||||
Markdown code for badget：
|
||||
```markdown
|
||||
[-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
|
||||
```
|
||||
[-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 with `AND`.
|
||||
- Add `LICENSE.996ICU` or `LINCES.NPL` file for details of 996ICU license.
|
||||
- Add `LINCESE.MIT` file for details of MIT license.
|
||||
- Single license files:
|
||||
- Add primary license content, such as MIT license.
|
||||
- Add separation line like `----------`.
|
||||
- Add 996ICU license content.
|
||||
|
||||
|
||||
52
proposal/proposal_template.md
Normal file
52
proposal/proposal_template.md
Normal file
@ -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. <br/>
|
||||
Hope we can record useful and valuable suggestions and make they true.
|
||||
|
||||
## Community Value
|
||||
|
||||
Provide a template for new proposals. <br/>
|
||||
A proposal can be used to record suggestions and aggrements. <br/>
|
||||
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. <br/>
|
||||
For example, currently, we don't have a way to record import decisions and suggestions. <br/>
|
||||
Pull Requests area is too general and not a good way to express ideas. <br/>
|
||||
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. <br/>
|
||||
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 <br/>
|
||||
- [PEP 1 -- PEP Purpose and Guidelines](https://www.python.org/dev/peps/pep-0001/)
|
||||
|
||||
## Copyright
|
||||
|
||||
This document has been placed in the public domain. <br/>
|
||||
***996.ICU Project All Right Reserved 2019***
|
||||
Reference in New Issue
Block a user