Commit Graph

1918 Commits

Author SHA1 Message Date
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
b4bfedc325 Update blacklist.md 2019-03-31 08:25:14 +08:00
94bf79f381 调整文章格式 2019-03-31 08:25:13 +08:00
2dadce61d8 加入引言 2019-03-31 08:22:52 +08:00
9292d34cfd 加入引言 2019-03-31 08:21:26 +08:00
44a606f1d6 更新证据材料网址
更新证据材料网址
2019-03-31 08:09:53 +08:00
f6e359b695 Update instruction.md
Add alternative words for the badge when HTML is applied
2019-03-31 07:39:33 +08:00
2b74605225 Update externals/instruction.md
Co-Authored-By: YangHanlin <mattoncis@hotmail.com>
2019-03-31 07:04:55 +08:00
685019399a Update greek language code 2019-03-30 16:38:20 -04:00
7540289c58 Update en_US.md
Modified some expressions and fixed some grammar issues.
2019-03-31 02:06:31 +08:00
cdf27774a2 Update blacklist.md 2019-03-31 02:03:01 +08:00
8f98cfdc9a add principle and purpose of this repository 2019-03-31 01:38:12 +08:00
7b5aa09218 Merge pull request #24740 from kowito/patch-1
Fixed type. in Thai language
2019-03-31 00:54:52 +08:00
040321cae1 Fixed type. 2019-03-30 23:38:46 +07:00
505d6c8675 rusty license generator 2019-03-31 00:31:45 +08:00
50cdf721e3 Update blacklist.md 2019-03-30 23:48:01 +08:00
c80cea3253 Update instruction.md
Add Markdown code for copying & pasting to add a badge linked to 996.icu
2019-03-30 23:43:47 +08:00
c1555d4b77 Update blacklist.md 2019-03-30 23:36:57 +08:00
feff21004d Update ga.md 2019-03-30 23:21:46 +08:00
9de6fa61d9 fix the format typo 2019-03-30 23:10:58 +08:00
1ca1d2f39d fix the external link format 2019-03-30 23:07:45 +08:00
01c25c23f3 Add Finnish translation 2019-03-30 22:56:18 +08:00
ff6a9acbc8 Create fi_FI.md 2019-03-30 22:53:49 +08:00
52a64ac1b4 Merge https://github.com/996icu/996.ICU 2019-03-30 22:08:43 +08:00
a5470d8f34 Update blacklist.md 2019-03-30 20:39:14 +08:00
93ab4a558d Merge pull request #24729 from XUJINKAI/patch-1
readme添加badge
2019-03-30 20:34:13 +08:00
XJK
5a97587956 Update README.md 2019-03-30 20:19:17 +08:00
b1d37ec7f7 Merge pull request #24728 from bofeiw/master
[update README] Move badge to "what can I do"
2019-03-30 20:00:27 +08:00
26176bc53c [update README] Move badge to "what can I do"
加徽章应该属于what can i do,建议修改,同时加入中文版的加徽章
2019-03-30 22:50:49 +11:00
c82ac0b497 Merge pull request #24727 from bofeiw/master
[update] 黑名单 链接名称改为文章标题
2019-03-30 19:27:33 +08:00
287890882e [update] 黑名单 链接名称改为文章标题
有标题的换成标题了,更易读
2019-03-30 22:19:33 +11:00
13a97d27e7 Update README.md 2019-03-30 19:17:59 +08:00
bcb2258fd6 Merge pull request #24725 from hezhao1016/master
添加黑名单 > 跨越速运 大小周 裁员
2019-03-30 19:17:11 +08:00
a811d2dfe7 Update blacklist.md 2019-03-30 19:12:46 +08:00
20e569043d Update blacklist.md 2019-03-30 19:12:18 +08:00
a92672a8d7 添加黑名单 > 跨越速运 大小周 裁员 2019-03-30 18:38:44 +08:00
17a4305c0e 添加黑名单 > 跨越速运 大小周 裁员 2019-03-30 18:34:18 +08:00
9d364bf602 拯救 996 的配方 2019-03-30 18:27:11 +08:00
838196d40c Merge pull request #24716 from uDp30Z4w/patch-6
Update blacklist.md
2019-03-30 18:23:23 +08:00
8c2b0908ad Merge pull request #24717 from dolsup/patch-1
Update i18n.md
2019-03-30 18:22:18 +08:00
93353ff3a3 Merge pull request #24720 from xingfanxia/master
Fix english translation
2019-03-30 18:20:26 +08:00
09993f515e fix english translation 2019-03-30 02:50:11 -07:00
a1782b0594 Merge branch '996icu-master' 2019-03-30 02:43:01 -07:00
a21ec12506 dl file 2019-03-30 02:42:47 -07:00