Commit Graph

1918 Commits

Author SHA1 Message Date
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
463dbb4d7c Update blacklist.md
新增名单
2019-04-09 15:39:43 +08:00
b3f98df176 Update news.md 2019-04-09 15:10:55 +08:00
691904fa17 Update news.md
996.ICU 背后:程序员在互联网公司的真实生态
2019-04-09 15:07:39 +08:00
655062f3e2 Merge pull request #25332 from houzuquan/master
添加央视新闻(央视新闻客户端)新闻报道
2019-04-09 15:06:10 +08:00
3204850194 Merge branch 'master' into master 2019-04-09 15:06:02 +08:00
65548eaae6 Merge pull request #25334 from jeeinn/master
Update news.md
2019-04-09 15:04:08 +08:00
7bf4945cee Merge branch 'master' into master 2019-04-09 15:03:59 +08:00
ef4531cfea Merge pull request #25319 from simon300000/patch-3
Update news.md, 改变Markdown格式, 增加Wayback Machine
2019-04-09 15:02:11 +08:00
9b2fb425d6 Add a reuters article for this subject 2019-04-09 08:39:28 +02:00
30ac657d57 Update news.md 2019-04-09 14:33:23 +08:00
2e2bd7ec54 Add tag on recruitment website.
Add `996ICU` and `955WLB` tag on recruitment website.
2019-04-09 14:29:01 +08:00
2e6ef71a1c 添加央视新闻(央视新闻客户端)新闻报道 2019-04-09 14:10:34 +08:00
9cabcd637b Update projects.md 2019-04-09 12:57:03 +08:00
a4761c0df5 添加支持远程工作的公司列表 2019-04-09 12:03:29 +08:00
588ea89278 Merge remote-tracking branch 'upstream/master' into local 2019-04-09 11:55:12 +08:00
7a8b7e5d95 Merge remote-tracking branch 'upstream/master' 2019-04-09 11:54:38 +08:00
087dd50b11 Edit conflict 2019-04-09 11:42:25 +08:00
134a318181 edit blacklist 2019-04-09 11:40:03 +08:00
5c766f171e Update news.md 2019-04-09 11:16:54 +08:00