Commit Graph

1945 Commits

Author SHA1 Message Date
c6aad9ce91 Merge pull request #25365 from tinytian/patch-2
Change “reports” to “press”.
2019-04-09 22:16:04 +08:00
8b89290872 Merge pull request #25364 from zhanggh8023/patch-1
增加南方都市报报道
2019-04-09 22:15:51 +08:00
aef49094c4 Merge pull request #25325 from Sam618/patch-1
Update projects.md
2019-04-09 22:14:45 +08:00
31d8a307ab Merge pull request #25336 from sunquanunice/patch-1
Add a reuters article for this subject
2019-04-09 22:14:28 +08:00
02d9d931f0 Merge pull request #25333 from lloydzhou/patch-1
在招聘网站给公司添加996ICU标签
2019-04-09 22:14:09 +08:00
ce7c529d76 Merge branch 'master' into patch-1 2019-04-09 22:13:53 +08:00
eb79c8162d Change “reports” to “press”. 2019-04-09 22:13:32 +08:00
78c7215cfe Merge pull request #25330 from SecurityPaper/master
SecurityPaper项目修改开源授权许可协议
2019-04-09 22:13:02 +08:00
eda2ff6c69 Merge branch 'master' into patch-1 2019-04-09 22:12:38 +08:00
27851de42b Merge pull request #25316 from CPdogson/patch-3
将996.action信息公开行动的翻译
2019-04-09 22:09:56 +08:00
0dc8c8008c Merge pull request #25317 from lufan0820/master
增加996公司名单
2019-04-09 22:09:18 +08:00
858f59eb2e Merge branch 'master' into master 2019-04-09 22:08:41 +08:00
63c2f8f0e7 Merge pull request #25360 from xloypaypa/master
建议加入其他工种的文件夹。
2019-04-09 22:05:48 +08:00
5da189a697 Merge pull request #25358 from edwardfhsiao/patch-1
Update projects.md. Support Anti996 License.
2019-04-09 22:05:04 +08:00
8e18690c23 Merge branch 'master' into patch-1 2019-04-09 22:04:53 +08:00
a6af8f462f Merge pull request #25359 from zouqianghtml/master
关于996-最新新闻
2019-04-09 22:04:30 +08:00
0776bfa0be Merge pull request #25357 from zhengyatian/master
update whitelist.
2019-04-09 22:03:37 +08:00
87695a5999 Merge pull request #25356 from ZedeX/patch-2
Update LICENCE - 增加“暗示”
2019-04-09 22:02:59 +08:00
21826c8190 Merge pull request #25354 from ZedeX/patch-1
Update LICENCE - include "metaphor"
2019-04-09 22:01:35 +08:00
1750502d17 Merge pull request #25352 from uDp30Z4w/master
Transfer link of 996.LAW and add 996.Arbitration
2019-04-09 22:00:49 +08:00
68ce4c0e68 Update news.md
增加南方都市报报道
2019-04-09 22:00:37 +08:00
d042855448 Merge pull request #25349 from zhangjile/patch-2
Correct name for the project
2019-04-09 21:59:49 +08:00
5535e3c3da Merge pull request #25346 from whsir/patch-1
Update news.md
2019-04-09 21:36:49 +08:00
db9211983b Merge pull request #25345 from KyleBing/master
add Rime for Wubi 极点
2019-04-09 21:36:32 +08:00
0f7313e309 Merge branch 'master' into master 2019-04-09 21:36:10 +08:00
3a53c24696 Merge pull request #25343 from lyfing22/master
增加996公司黑名单(广州区)
2019-04-09 21:35:02 +08:00
f3b3c19ad8 Merge branch 'master' into master 2019-04-09 21:34:51 +08:00
6adcbf77d6 Merge pull request #25342 from yoyo837/patch-1
add item
2019-04-09 21:34:08 +08:00
386247831e Merge pull request #25341 from mrme2014/patch-1
新增一款开源项目  支持996license
2019-04-09 21:33:43 +08:00
3c53d5905e Merge pull request #25339 from YouQuDeSoul/master
Update blacklist.md
2019-04-09 21:32:48 +08:00
dd181ad758 Merge pull request #25337 from fenglc/patch-1
Update news.md
2019-04-09 21:32:17 +08:00
ff5436d158 Update README.md 2019-04-09 21:31:10 +08:00
e41c4db6ac 建议加入其他工种的文件夹。 2019-04-09 20:17:25 +08:00
7cf846fd5a 最新新闻 2019-04-09 18:45:53 +08:00
49a4f744c7 Update projects.md
Support Anti996 License.
2019-04-09 18:14:02 +08:00
a91b146546 update whitelist. 2019-04-09 17:59:36 +08:00
8cc60c063c Update LICENCE - 增加“暗示”
暗示(隐性强制)的情况在中国公司中还是很常见的。
2019-04-09 17:57:58 +08:00
943a35be1e Update LICENCE - include "metaphor"
Metaphor is a very common sence in Chinese company.
2019-04-09 17:55:19 +08:00
c482e3b459 Update README.md 2019-04-09 17:43:12 +08:00
31fbf936ed Update README_CN.md 2019-04-09 17:43:09 +08:00
bca67c64b6 Update LICENSE
A double quotation mark is definitely a must to avoid ambiguity.
2019-04-09 17:28:39 +08:00
de531d8af7 Merge branch 'master' into master 2019-04-09 17:12:09 +08:00
fa0bcb3454 fix typo 2019-04-09 16:46:58 +08:00
c553d31929 add TouchbarBTT 2019-04-09 16:43:27 +08:00
59e2a3b16e add Rime for Wubi 极点 2019-04-09 16:18:13 +08:00
2bb8ad88ab Update news.md 2019-04-09 16:12:51 +08:00
bc35dc13c3 add item 2019-04-09 16:06:43 +08:00
cee5be67a3 Merge remote-tracking branch 'upstream/master' 2019-04-09 16:01:12 +08:00
6f6e0cad61 Update projects.md
新增一款开源项目  支持996license
2019-04-09 16:00:21 +08:00
02dc6f22b5 Merge remote-tracking branch 'upstream/master' into local 2019-04-09 15:59:39 +08:00