Commit Graph

1945 Commits

Author SHA1 Message Date
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
d8625b300e Update news.md 2019-04-09 11:15:38 +08:00
b358887f3d Update news.md 2019-04-09 10:54:59 +08:00
LF
046edf1ac2 Merge branch 'master' into master 2019-04-09 10:40:55 +08:00
8a185ea367 将信息公开行动的翻译
为996action添加一段翻译
强调信息公开的合法性、参与度高、是一项不会使你丢掉工作的法律行动。除此之外,996action未来将举行更多的活动,立法建议信、研讨会等
2019-04-09 10:36:54 +08:00
9b84e16702 添加996公司名单 2019-04-09 10:36:03 +08:00
04e1e9c5e1 Merge pull request #25311 from pphdsny/dev/leetcode-java
feat: 添加leetcode-java项目icon
2019-04-09 10:28:29 +08:00
f999ed7c2f Merge pull request #25314 from cleveralgorithms/master
添加 极客时间 数据分析45讲笔记
2019-04-09 10:28:19 +08:00
1ca7aa8526 Merge branch 'master' into master 2019-04-09 10:28:12 +08:00
e91a854e66 Merge pull request #25313 from simon300000/patch-2
Update projects.md 增加996icu-slack-recorder
2019-04-09 10:27:28 +08:00
39ff1a8116 Merge branch 'master' into patch-2 2019-04-09 10:27:20 +08:00
770e6e6de3 Merge pull request #25312 from kwuaint/patch-3
better expressions
2019-04-09 10:26:32 +08:00
666746a5a6 Merge pull request #25310 from Johnny-Wish/master
fix a typo in blacklist.md
2019-04-09 10:26:00 +08:00
51549af184 add Lancoo Group to blacklist 2019-04-09 10:25:55 +08:00
6d46198880 Merge pull request #25309 from YeDaxia/patch-1
add JApiDocs to anti 996 License
2019-04-09 10:25:32 +08:00
24877bb21b Merge branch 'master' into patch-1 2019-04-09 10:25:24 +08:00
a9c37acbe1 Merge pull request #25308 from CPdogson/patch-1
Update README.md 利用对劳动监督部门进行信息公开来督促休息制度的执行
2019-04-09 10:24:42 +08:00
23a7e16971 Merge pull request #25307 from tranch/patch-1
添加广州创思
2019-04-09 10:24:16 +08:00
a523aa8910 Merge branch 'master' into patch-1 2019-04-09 10:24:07 +08:00
386e607439 Merge pull request #25304 from kduxin/duxin
扩充996公司blacklist,增加金杜律师事务所(上海)。
2019-04-09 10:23:37 +08:00
d3975b2938 Merge branch 'master' into duxin 2019-04-09 10:23:28 +08:00
24de378971 Merge pull request #25301 from whateverKills/master
列表加入数美科技
2019-04-09 10:22:47 +08:00
5255f3ea5e Merge branch 'master' into master 2019-04-09 10:22:40 +08:00
89fcb45c99 Merge pull request #25297 from tannoldlee/patch-1
Update blacklist.md
2019-04-09 10:21:29 +08:00
a74e8e0f8f Merge branch 'master' into patch-1 2019-04-09 10:21:20 +08:00
d2b5d014d6 Merge pull request #25296 from atnylu/master
Update blacklist.md
2019-04-09 10:20:55 +08:00
363b5176b3 Merge pull request #25292 from jeeinn/master
Update projects.md
2019-04-09 10:20:32 +08:00
952f98657f Merge branch 'master' into master 2019-04-09 10:20:24 +08:00
5fb0c03fbb Merge pull request #25290 from xunmengyiran/master
blackist新增苏州同思软件有限公司
2019-04-09 10:19:54 +08:00
6b38be4751 Merge pull request #25289 from Jormungendr/patch-1
Update projects.md
2019-04-09 10:19:25 +08:00
ef29a64a20 添加 极客时间 数据分析45讲笔记 2019-04-09 10:04:27 +08:00
e258965afc Update projects.md 2019-04-09 10:03:25 +08:00