Commit Graph

2393 Commits

Author SHA1 Message Date
76880be368 Merge pull request #1 from 996icu/master
updata
2019-04-15 22:32:39 +08:00
81862ecb1f 去除冗余,报道列表有重复 2019-04-15 19:15:17 +08:00
f09c29dd56 Merge pull request #25575 from yanghongfei/master
[Update]OpenDevOps Star和License图标
2019-04-15 19:06:01 +08:00
b2d72bc61e Merge pull request #25574 from moxiaoyizui/patch-1
更新半月谈公众号新推文
2019-04-15 19:05:48 +08:00
ed9809099e Merge pull request #25573 from HolyChen/master
增加环球时报主编胡锡进的评论
2019-04-15 19:05:31 +08:00
33cf36a4db Merge pull request #25572 from PureDark233/patch-2
Correct the wrong link to Laihua
2019-04-15 19:04:48 +08:00
97efea2c6e Merge pull request #25570 from wyh3393/master
Update ja_JP.md
2019-04-15 19:04:19 +08:00
1606524a10 Merge pull request #25569 from Johnny-Wish/master
add news report 半月谈评论:996与奋斗无关,与利益有关
2019-04-15 19:03:42 +08:00
d1d94d02a0 Merge pull request #25568 from moqinc/patch-2
add 成都索贝 to blacklist
2019-04-15 19:03:27 +08:00
40f38879f5 Merge branch 'master' into patch-2 2019-04-15 19:03:21 +08:00
6c60da2a1b Merge pull request #25567 from gulaug/master
Add feature to blacklist
2019-04-15 19:02:57 +08:00
b331f6c21e Merge branch 'master' into master 2019-04-15 19:02:47 +08:00
37c32b5ae9 Merge pull request #25566 from zheolong/master
增加程序员职业病项目链接
2019-04-15 19:02:06 +08:00
9b9d27df09 Merge pull request #25562 from Tooodis/myIdea
+ road map
2019-04-15 19:00:14 +08:00
cd87a98909 Merge pull request #25560 from qin-yu/qy/fix-license-grammar
Fix grammar in LICENSE
2019-04-15 18:59:35 +08:00
e04d054c5b Merge pull request #25559 from qin-yu/qy/update-external-news_en
Updated news_EN.md (by 14 Apr 2019, SUN)
2019-04-15 18:59:16 +08:00
cfd4a6938c Merge pull request #25558 from AtagoAoi/master
Adding new company to blacklist
2019-04-15 18:58:47 +08:00
ba800dbf8c Merge branch 'master' into master 2019-04-15 18:58:39 +08:00
0c9233d245 Merge pull request #25555 from repyl/patch-1
Update README.md
2019-04-15 18:57:25 +08:00
1357a8758f Merge pull request #25554 from githubmll/patch-6
病句修复
2019-04-15 18:57:11 +08:00
384ebe1ab5 [Update]OpenDevOps Star和License图标 2019-04-15 17:53:20 +08:00
d804894eec Update news.md 2019-04-15 17:51:00 +08:00
b949405886 Delete it_IT.md 2019-04-15 16:39:41 +08:00
f4dae0454a add Hu Xijin's review 2019-04-15 16:28:12 +08:00
39d81ac20c Correct the wrong link to Laihua.
The previous link to the site of 深圳市前海手绘科技文化有限公司 in README.md is "http://https://www.laihua.com/", which will result in "http://https//www.laihua.com/" in Chrome and Edge and the website can't be opened correctly. So I correct it by the link "https://www.laihua.com/".
2019-04-15 15:30:53 +08:00
2a4b223ddd Update ja_JP.md
修改了一下敬语乱用,以及一些凭空造词的问题
2019-04-15 15:58:29 +09:00
b333d79c68 add news report 半月谈评论:996与奋斗无关,与利益有关 2019-04-15 14:52:06 +08:00
b5495e82d6 add 成都索贝 to blacklist
add 成都索贝 to blacklist
2019-04-15 13:37:54 +08:00
843f4561cc Update README.md 2019-04-15 11:18:42 +08:00
a049365a8b Update README.md 2019-04-15 11:17:03 +08:00
dada1f2994 photoevidence 2019-04-15 11:15:02 +08:00
28a233fb9b README.md: add 996.OD link for occupational disease 2019-04-15 11:14:08 +08:00
2b76131656 add 996.OD link for occupational disease 2019-04-15 11:10:09 +08:00
e72a12d056 Update README.md 2019-04-15 11:08:29 +08:00
8b5dfb2f5c Update README.md 2019-04-15 11:06:57 +08:00
05cf8c3132 add blacklist 2019-04-15 11:04:58 +08:00
e757fa5c21 + road map 2019-04-15 09:18:00 +08:00
23db0387a1 Fix grammar in LICENSE
Fixed one error in grammar.
2019-04-14 22:06:37 +01:00
8bbf1e6574 Update news_EN.md 2019-04-14 20:41:51 +01:00
67258cbb74 Merge branch 'master' into master 2019-04-14 23:54:00 +08:00
98af852a73 Merge pull request #1 from AtagoAoi/AtagoAoi3
Adding new company to blacklist
2019-04-14 23:48:00 +08:00
42060f9c93 Adding new company to blacklist
武汉斗鱼网络科技有限公司,要求员工每天无偿加班至少两小时,并且拖欠大量工资
2019-04-14 23:47:21 +08:00
03ebb24743 Adding new 996 company to blacklist 2019-04-14 23:45:12 +08:00
7887948143 Update README.md 2019-04-14 22:04:56 +08:00
be2e603607 病句修复
删除多余“的”
2019-04-14 21:17:17 +08:00
e7ae2c2640 Merge pull request #25551 from Johnny-Wish/master
增加工人日报报导 : 马云谈996时,可曾知道8小时工作制是这样争取来的!
2019-04-14 18:27:14 +08:00
dff20c3185 Merge branch 'master' into master 2019-04-14 18:27:06 +08:00
311757c4b7 Merge pull request #25548 from liyujiang-gzu/master
添加“华为杭州研发基地+华为外包”加班的打卡记录证据
2019-04-14 18:26:20 +08:00
cf246624e5 Merge pull request #25547 from KyleStore/master
add KyleBing/diary proj
2019-04-14 18:26:05 +08:00
3f2d0ad0a8 Merge pull request #25545 from linhr/patch-1
添加人民日报评论
2019-04-14 18:25:36 +08:00