Commit Graph

2285 Commits

Author SHA1 Message Date
93f7e8efa3 Merge branch 'master' into master 2019-04-14 18:24:35 +08:00
3d0a87367a Merge pull request #25528 from cjim8889/master
Improve grammatical consistency
2019-04-14 18:23:02 +08:00
ab9a2cee61 Merge branch 'master' into master 2019-04-14 18:22:53 +08:00
3b87a5cebc Merge pull request #25527 from lilianjin/master
Add 996 license project
2019-04-14 18:21:09 +08:00
d4a92134e4 Merge pull request #25523 from coaxhappy/master
add idetool
2019-04-14 18:20:16 +08:00
4c7fc31f22 Merge branch 'master' into master 2019-04-14 18:20:09 +08:00
b78b22f036 Merge pull request #25521 from hongseshenying/master
add blacklist company
2019-04-14 18:19:35 +08:00
d2a31eab0a Merge branch 'master' into master 2019-04-14 18:19:27 +08:00
e7d9311409 Merge pull request #25518 from hiSandog/master
上海邻趣995
2019-04-14 18:18:43 +08:00
69ac17885e Merge branch 'master' into master 2019-04-14 18:18:37 +08:00
c2c852830c Merge pull request #25517 from jingshaoqi/master
名单增加 北京数码视讯科技股份有限公司
2019-04-14 18:18:08 +08:00
7e07954aa3 Merge branch 'master' into master 2019-04-14 18:17:56 +08:00
be9e485674 Merge pull request #25516 from EmonLieu/master
中富通 鼓励996精神 要求落实
2019-04-14 18:17:31 +08:00
52b8d431e2 Merge branch 'master' into master 2019-04-14 18:17:22 +08:00
f870e9305b Merge pull request #25514 from Cazaea/patch-1
Adding anti-996 license items.
2019-04-14 18:16:56 +08:00
1df5706dd8 Merge branch 'master' into patch-1 2019-04-14 18:16:48 +08:00
876ef7513b Merge pull request #25493 from mlhy/patch-2
Update README.md
2019-04-14 18:15:27 +08:00
f218be6075 Merge branch 'master' into patch-2 2019-04-14 18:15:21 +08:00
dcc4f0cdb8 Merge pull request #25492 from tianchen92/blacklist
revert "黑名单添加 中科曙光"
2019-04-14 18:14:57 +08:00
c4cf6d6aa4 Merge pull request #25491 from anti996sz/master
add another one to the black list with evidences.
2019-04-14 18:14:39 +08:00
b4587a37cc Merge branch 'master' into master 2019-04-14 18:14:26 +08:00
3864642c48 Merge pull request #25550 from CoderKwong/master
添加人民日报评论《不能给反对996的员工贴“混日子”标签》
2019-04-14 17:59:57 +08:00
0abff86f5a 添加《不能给反对996的员工贴“混日子”标签》 2019-04-14 17:03:38 +08:00
131c36ce55 名单增加-来画视频
来画视频实行996连坐制度
2019-04-14 12:32:38 +08:00
c32cdab308 来画996
群聊截图
2019-04-14 12:28:23 +08:00
b3ac450b43 Merge pull request #25522 from kerlomz/master
feat: 新增captcha_trainer项目
2019-04-14 11:29:11 +08:00
8b473d45ba Merge pull request #25539 from wintonBy/patch-1
Update remotelist.md
2019-04-14 11:28:44 +08:00
e0ff8cd1e0 Merge pull request #25525 from g497813927/master
Update news.md
2019-04-14 11:28:23 +08:00
99c87c20d8 Merge pull request #25538 from formulahendry/955
Update description for 955.WLB
2019-04-14 11:28:02 +08:00
80061df057 Merge pull request #25533 from gaoyaoxin/patch-8
NO any -> NO
2019-04-14 11:27:07 +08:00
01d2912853 Merge pull request #25531 from wojiaowanghaha/patch-1
Update news.md
2019-04-14 11:26:49 +08:00
9718494402 Merge pull request #25537 from happymili/master
specify the 996.icu home page language
2019-04-14 11:26:31 +08:00
581d0b43d0 Merge pull request #25536 from ujmkiolp/master
八小时之歌
2019-04-14 11:26:09 +08:00
6458fdc9e9 Update remotelist.md 2019-04-14 11:23:02 +08:00
28116aadb2 Update description for 955.WLB 2019-04-14 10:54:36 +08:00
e62f3d2768 Update README_CN.md 2019-04-14 10:24:42 +08:00
8790be26b4 Update README.md 2019-04-14 10:23:36 +08:00
b825ddc04f 八小时之歌
The song “Eight Hours” was first published in musical form in 1878. The song’s lyrics were written by I.G. Blanchard, and the music was written by Rev. Jesse H. Jones.
2019-04-14 10:14:35 +08:00
a286c2852e NO any -> NO
"no any" is ungrammatical. See "to sum" part at the bottom of https://ell.stackexchange.com/questions/56791/there-is-no-any-there-is-no for details.
2019-04-14 01:46:07 +08:00
1ace62f19a Merge pull request #25529 from githubmll/patch-4
错误路径修复
2019-04-14 01:42:54 +08:00
214a8811c9 Merge pull request #25530 from githubmll/patch-5
[pull/15642 最初草案](LICENSE) 不建议显示,如果显示需修复错误路径
2019-04-14 01:42:34 +08:00
cda5aef26e Update news.md
add 联合早报  最新报道
2019-04-13 23:40:56 +08:00
f8a0d79fa6 [pull/15642 最初草案](LICENSE) 不建议显示,如果显示需修复错误路径
路径错误 404
2019-04-13 22:59:13 +08:00
b9da19a777 错误路径修复
Path error 404
2019-04-13 22:49:03 +08:00
7bf4e6ac19 Improve grammatical consistency
Fix some grammatical errors
2019-04-13 14:57:09 +01:00
45dc3892f0 Merge pull request #1 from 996icu/master
2019-04-13 14:54:34 +01:00
0de9950f56 Update README.md 2019-04-13 21:03:15 +08:00
677bc83cd7 Update README.md 2019-04-13 20:53:13 +08:00
3d542889ba Update README.md 2019-04-13 20:51:49 +08:00
1f0866ec5b Update news.md
添加杭州都市快报的新闻
2019-04-13 19:57:29 +08:00