Commit Graph

2724 Commits

Author SHA1 Message Date
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
3418ba36ec add new report by 工人日报 : 马云谈996时,可曾知道8小时工作制是这样争取来的! 2019-04-14 18:00:14 +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
29684d8c86 有老铁(#25532)想要把华为移除黑名单,特此添加“华为杭州研发基地+华为外包”加班的打卡记录证据,华为正式员工和华为外包员工一起工作,作息是一样的: 2019-04-14 16:22:17 +08:00
8339a63ad2 add Diary: a web app 2019-04-14 15:51:05 +08:00
4a88ea7382 Update news.md 2019-04-13 23:48:12 -07:00
d3f8b6bd89 add new company to blacklist 2019-04-14 14:46:05 +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
43338fb5d9 Update README.md 2019-04-13 20:50:30 +08:00
1f0866ec5b Update news.md
添加杭州都市快报的新闻
2019-04-13 19:57:29 +08:00
b44da19477 Update README.md 2019-04-13 18:27:16 +08:00
4fc4d82f49 add idetool 2019-04-13 18:26:13 +08:00
67d5e7a4e4 Merge pull request #1 from 996icu/master
add idetool
2019-04-13 18:21:42 +08:00
57ab5d2e7d feat: 新增captcha_trainer项目 2019-04-13 18:19:57 +08:00
5a072b1f88 [ImgBot] Optimize images
*Total -- 1,553.11kb -> 1,344.85kb (13.41%)

/blacklist/img/金山软件-9106.png -- 29.15kb -> 13.10kb (55.06%)
/blacklist/img/fjxxqmfj.png -- 67.91kb -> 34.11kb (49.77%)
/blacklist/img/fjxxydkq.png -- 16.69kb -> 8.69kb (47.92%)
/blacklist/img/fjxxydfj.png -- 43.13kb -> 22.53kb (47.76%)
/blacklist/img/北京中广创思9107钉钉截图.jpg -- 71.24kb -> 60.22kb (15.46%)
/blacklist/蚂蚁金服996嘲讽微信.png -- 678.65kb -> 605.28kb (10.81%)
/whitelist/img/mgtv.png -- 181.01kb -> 167.31kb (7.57%)
/blacklist/img/hxqc2.jpg -- 241.29kb -> 224.22kb (7.07%)
/blacklist/img/hxqc1.jpg -- 224.04kb -> 209.38kb (6.54%)
2019-04-13 10:19:02 +00:00
19310d6b43 Update README.md 2019-04-13 18:12:38 +08:00
a8521a8d3f Update README.md 2019-04-13 18:11:04 +08:00
7f7f1a7a35 Add files via upload 2019-04-13 18:10:08 +08:00
d5583cb192 Merge pull request #25502 from dhcn/master
Update README.md
2019-04-13 16:21:16 +08:00
0482dff987 Merge pull request #25511 from maillengxue/patch-2
Update README.md
2019-04-13 16:20:18 +08:00
70ac43e566 Merge pull request #25519 from stupdit1t/master
Removal of sensitive information
2019-04-13 16:19:36 +08:00
94d0abead7 Merge pull request #25520 from toshihidetagami/toshihidetagami-patch-1
minor fix to Japanese translation
2019-04-13 16:19:03 +08:00