Merge branch 'master' into master

This commit is contained in:
996icu
2019-04-02 09:34:08 +08:00
committed by GitHub
5 changed files with 30 additions and 9 deletions

View File

@ -1,17 +1,19 @@
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).
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)
[![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
[![Badge](https://img.shields.io/badge/link-996.icu-red.svg)](https://996.icu/#/zh_CN)
Join discussion at [slack](https://join.slack.com/t/996icu/shared_invite/enQtNTc5MTU4MDkxOTA1LTJlYWVmMGQxOWNjZDA2NzdkMzQ3MjkzYmFlYTAxMTczZGQ0NmQ5ZWY5MTVjODQ4MWFkZGRhMmRmY2UwZGUyOTQ).
Join the discussion on [slack](https://join.slack.com/t/996icu/shared_invite/enQtNTc5MTU4MDkxOTA1LTJlYWVmMGQxOWNjZDA2NzdkMzQ3MjkzYmFlYTAxMTczZGQ0NmQ5ZWY5MTVjODQ4MWFkZGRhMmRmY2UwZGUyOTQ).
If you want to reference 996.icu badge, read [What can I do?](#what-can-i-do) as follow.
If you want to reference 996.ICU badge, read [What can I do?](#what-can-i-do) as follows.
Repo for counting stars and contributing. Press <kbd>F</kbd> to pay your respect to honorable developers.
Repo for counting stars and contributing. Press <kbd>F</kbd> to pay your respects to honorable developers.
感谢《中国青年报》为我们发声:[被“996”工作制围困的年轻人像是定好闹钟的机器](https://www.chinanews.com/sh/2019/04-02/8797483.shtml)
What is 996?
---
@ -28,12 +30,14 @@ 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).
- Add proposals to give advise and suggestion about the development of 996.ICU.
*****
- 更新这个[名单](blacklist/blacklist.md)(附带证据),来帮助每一位工作者。
- 把这个[徽章](externals/instruction.md)加入你的项目来支持 996.ICU
- 为您的项目添加[反 996 许可证](LICENSE_CN)。
- 给社区与项目发展提出新的议案。
Principles and purposes
---
@ -60,6 +64,19 @@ Principles and purposes
* 目前反 996 许可证还处于起草阶段,希望有相关经验的专业人士能给予帮助。
Proposals
---
A proposal is a document accepted by 996.ICU.
Typically, a proposal should give a solution or suggestion about the development of the project and community.
For more details, you can read the [proposal template](proposal/proposal_template.md) document.
To help the development of 996.ICU, you can do several things base on proposals.
- Read the accepted proposals and try to improve them.
- Take actions according to the accepted proposals.
- Give your own proposals with a PR following the proposal format.
Expand influence
---
@ -100,8 +117,8 @@ 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.
- This draft is adapted from the MIT license. For more detailed explanation, 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 is willing to contribute to further version directly, please go to [Anti-996-License-1.0](https://github.com/kattgu7/996-License-Draft). Thank you.
*****

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -28,3 +28,7 @@ Projects under 996ICU License. Thanks for your support!
| <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~ |
| - | [Android-KlineChar](https://github.com/icechao/kline) |[icechao](https://github.com/icechao)| 安卓高仿火币,快速实现K线功能的lib |
| - | [Android-ZBLibrary](https://github.com/TommyLemon/Android-ZBLibrary) |[Android-ZBLibrary](https://github.com/TommyLemon/Android-ZBLibrary)| 🔥Android MVP快速开发框架做国内 「Demo最全面」「注释最详细」「使用最简单」「代码最严谨」的Android开源UI框架 |
| <img src="https://xpnet-public.oss-cn-hangzhou.aliyuncs.com/color_admin_v4.2/frontend/template/assets/img/leetcode/leetcode.png"> | [awesome-golang-leetcode](https://github.com/kylesliu/awesome-golang-leetcode) |[Kyle Liu](https://github.com/kylesliu)| Leetcode Golang 题解 |
| - | [easy-filter](https://github.com/PsChina/easy-filter) | [PsChina](https://github.com/PsChina) | vue2.x 过滤器插件 |
| - | [one](https://github.com/lizhichao/one) | https://github.com/lizhichao/one | 一个极简的高性能常驻内存php框架|

View File

@ -4,7 +4,7 @@
## Was ist "996"?
Der Name "996-Arbeitsmuster" bezieht sich auf einen inoffiziellen Arbeitsrhythmus, und zwar von 9 bis 21 Uhr täglich an sechs Tagen die Woche. Heutzutage wird so ein Arbeitsrhythmus in China immer gewöhnlicher. Dieser entspricht mindestens 60 Arbeitsstunden pro Woche. Dies ist gesetzlich nicht erlaubt.
## [Verfassungen der Volksrepublik China](http://www.verfassungen.net/rc/verf82-i.htm)
## [Verfassung der Volksrepublik China](http://www.verfassungen.net/rc/verf82-i.htm)
Artikel 43

View File

@ -6,7 +6,7 @@
**中国標準的な労働時間:**
労働時間は 1 日 8 時間で, 平均週 40 時間と制限されます。残業上限は 1 日 3 時間、及び月 36 時間と制限されます。
また、法律により、残業の給料は平日の給料の最低でも 150% にしなければなりません。
また、法律により、残業代は普段の給料の 150% 以上にしなければなりません。
一週間の最大労働時間を参考にし、労働時間が週48時間の場合、平均月給日数は 21.75 日です。
**『中華人民共和国労働法』**(以下 **「労働法」** と称する)**第四章第三十六条**