Commit Graph

1350 Commits

Author SHA1 Message Date
990086ef42 Merge pull request #24787 from uDp30Z4w/patch-7
Update blacklist.md
2019-03-31 21:55:19 +08:00
7ff3595a17 Update exposure.md 2019-03-31 21:51:16 +08:00
aacc9b33e4 Merge pull request #24746 from ImVictorCheng/patch-1
Modified some expressions and fixed some grammar issues.
2019-03-31 21:20:35 +08:00
7e0b4772f1 Merge pull request #24789 from Abiggg/master
增加黑名单公司
2019-03-31 21:16:29 +08:00
470441bd88 增加黑名单公司“ 2019-03-31 20:31:35 +08:00
abd9cec28f Update externals/rescue.md
修改markdown样式

Co-Authored-By: qiankunpingtai <46507972+qiankunpingtai@users.noreply.github.com>
2019-03-31 19:57:02 +08:00
ee1ef79b94 Update blacklist.md 2019-03-31 19:38:03 +08:00
3bb0732d39 Update blacklist.md
|杭州|[智贝信息科技有限公司](https://www.zhipin.com/gongsi/09aefd7a9d507c2f1nd82tu9Ew~~.html)|2019年3月|强制996、歧视程序员|[程序员吐槽:薪资低,996加班无补助,歧视程序员,这hr真乃神人](https://baijiahao.baidu.com/s?id=1627625016599313128)|
2019-03-31 22:29:30 +11:00
a92aff7aa2 Update LICENSE 2019-03-31 18:04:10 +08:00
da36b73f98 Update LICENSE
Add text identification
2019-03-31 18:01:39 +08:00
cefffcfdb1 Exposure of a 996 company often working overtime too tired 2019-03-31 16:35:53 +08:00
8bb2d3ba8c 拯救 996 的配方,以部分加粗的方式突出重点 2019-03-31 16:09:09 +08:00
f05bb31784 Merge branch 'master' of https://github.com/996icu/996.ICU 2019-03-31 16:07:27 +08:00
940a486d43 add 武汉氪细胞 2019-03-31 15:30:33 +08:00
a5f5a3f519 add 武汉氪细胞 2019-03-31 15:19:44 +08:00
619adca05a Update README.md 2019-03-31 14:58:22 +08:00
c7dc580b79 Fixed a grammar error
can use `per week` or `in a week`.
2019-03-31 17:14:50 +10:30
997fb85294 Merge pull request #24772 from LoveXiaoLiu/master
README.md 语句不通顺,进行修改
2019-03-31 13:56:24 +08:00
612095b7b6 README.md 语句不通顺,进行修改 2019-03-31 13:50:30 +08:00
512e067739 合并upstream更改 2019-03-31 13:30:57 +08:00
0c1e0ad11d Update blacklist.md 2019-03-31 13:23:47 +08:00
7996d5fa04 Improve the English of README 2019-03-31 13:23:42 +08:00
f0780d4c2c Fix typo 2019-03-31 13:19:27 +08:00
11fc33475a Add instruction for how to use multi-licensing 2019-03-31 13:03:48 +08:00
c2135a12ef Update README.md 2019-03-31 12:49:21 +08:00
a6787d14d1 Update README.md 2019-03-31 12:39:03 +08:00
18bb8b9e54 update the translation of 'principle and purpose' 2019-03-31 12:38:40 +08:00
11124c64bd Update blacklist.md 2019-03-31 12:13:20 +08:00
35a3918995 Update blacklist.md
怎么没有外包上榜
2019-03-31 12:12:25 +08:00
5ee2aef875 Merge pull request #24739 from YangHanlin/patch-1
更新 instruction.md:增加添加徽章的 Markdown 代码
2019-03-31 12:08:01 +08:00
316a2d63d6 Merge pull request #24750 from iamybj/patch-1
更新证据材料网址
2019-03-31 12:06:53 +08:00
afd284856c 拯救 996 模型畅想 2019-03-31 11:59:48 +08:00
2867ffb173 Merge pull request #24749 from signalw/master
Update greek language code
2019-03-31 11:58:44 +08:00
49f73b4996 Merge pull request #24755 from untunt/master
fix grammatical errors in README.md and improve Japanese translation
2019-03-31 11:54:19 +08:00
8e9b29a740 Merge pull request #24738 from chen-stev/patch-1
Update blacklist.md
2019-03-31 11:45:37 +08:00
a0e742280f Merge pull request #24741 from luojia65/master
Rusty 996ICU license generator
2019-03-31 11:37:57 +08:00
46700a5e7e adjust format and style 2019-03-31 11:34:58 +08:00
d679e2a890 Merge pull request #24754 from SDUSTER/patch-0331
修改 README.md的badge链接
2019-03-31 11:31:29 +08:00
ee1cc84404 Merge pull request #24752 from kwdiwt/patch-2
修复城市一栏纵向排序
2019-03-31 11:30:43 +08:00
630e63fbbd Merge pull request #24735 from henrysher/create-i18n-finnish
Add Finnish translation
2019-03-31 11:28:56 +08:00
1570fa34be Merge pull request #24743 from yyrdl/master
在主README里面添加基本主张和目的 / Add principle and purpose of this repository
2019-03-31 11:28:43 +08:00
c68fe28f3a add the proposal template file 2019-03-31 11:27:43 +08:00
a01a934a34 Merge pull request #24745 from simon300000/patch-1
黑名单把一个“知乎问答”改成了网站网页标题
2019-03-31 11:24:11 +08:00
f52cce6112 Merge pull request #24736 from dragon-yuan/patch-1
Update ga.md
2019-03-31 11:22:50 +08:00
4ea85d5cbc Merge pull request #24753 from Tedko/patch-1
A New license drafted by Katt Gu & Suji Yan
2019-03-31 10:44:31 +08:00
unt
6bbad26fa4 fix grammatical errors 2019-03-30 22:08:11 -04:00
unt
770f91224d replace legal terms with translation on www.jil.go.jp
https://www.jil.go.jp/foreign/jihou/2004_7/china_01_01.html
2019-03-30 21:47:48 -04:00
77f6e049b1 修改 README.md的badge链接
最头上的链接应该是真正的996.icu链接就好,下面需要引用的链接已经给出就没必要重复链接到instruction.md了
2019-03-31 09:40:39 +08:00
943b2f6035 A New license drafted by Katt Gu & Suji Yan
This version of 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. 

Since the working hour limit is almost included in the labor law of every country, it is better just saying compliance with labor law rather then saying the hours, cuz I believe what those companies do is more than force their employees to work overnight. For countries with no labor law or where the labor law is not enforceable (like most authoritarian countries), core international labor standards is the internationally agreed minimum standards.

For more details about International Labor Law, please check [International Labour Orginazation](ilo.org) and [The WTO and International Labour Organization](https://www.wto.org/english/thewto_e/coher_e/wto_ilo_e.htm).

For law professionals or anyone who are willing to contribute to further version directly, please go to [996-License-Draft](https://github.com/kattgu7/996-License-Draft). Thank you.
2019-03-31 09:13:52 +08:00
01bd75c94c Update blacklist.md 2019-03-31 08:57:23 +08:00