Commit Graph

1833 Commits

Author SHA1 Message Date
996icu
d042855448 Merge pull request #25349 from zhangjile/patch-2
Correct name for the project
2019-04-09 21:59:49 +08:00
996icu
5535e3c3da Merge pull request #25346 from whsir/patch-1
Update news.md
2019-04-09 21:36:49 +08:00
996icu
db9211983b Merge pull request #25345 from KyleBing/master
add Rime for Wubi 极点
2019-04-09 21:36:32 +08:00
996icu
0f7313e309 Merge branch 'master' into master 2019-04-09 21:36:10 +08:00
996icu
3a53c24696 Merge pull request #25343 from lyfing22/master
增加996公司黑名单(广州区)
2019-04-09 21:35:02 +08:00
996icu
f3b3c19ad8 Merge branch 'master' into master 2019-04-09 21:34:51 +08:00
996icu
6adcbf77d6 Merge pull request #25342 from yoyo837/patch-1
add item
2019-04-09 21:34:08 +08:00
996icu
386247831e Merge pull request #25341 from mrme2014/patch-1
新增一款开源项目  支持996license
2019-04-09 21:33:43 +08:00
996icu
3c53d5905e Merge pull request #25339 from YouQuDeSoul/master
Update blacklist.md
2019-04-09 21:32:48 +08:00
996icu
dd181ad758 Merge pull request #25337 from fenglc/patch-1
Update news.md
2019-04-09 21:32:17 +08:00
996icu
ff5436d158 Update README.md 2019-04-09 21:31:10 +08:00
Alvin
bca67c64b6 Update LICENSE
A double quotation mark is definitely a must to avoid ambiguity.
2019-04-09 17:28:39 +08:00
Kyle Bing
fa0bcb3454 fix typo 2019-04-09 16:46:58 +08:00
Kyle Bing
c553d31929 add TouchbarBTT 2019-04-09 16:43:27 +08:00
Kyle Bing
59e2a3b16e add Rime for Wubi 极点 2019-04-09 16:18:13 +08:00
whsir
2bb8ad88ab Update news.md 2019-04-09 16:12:51 +08:00
Amumu
bc35dc13c3 add item 2019-04-09 16:06:43 +08:00
mrme2014
6f6e0cad61 Update projects.md
新增一款开源项目  支持996license
2019-04-09 16:00:21 +08:00
Developer
463dbb4d7c Update blacklist.md
新增名单
2019-04-09 15:39:43 +08:00
fenglc
b3f98df176 Update news.md 2019-04-09 15:10:55 +08:00
fenglc
691904fa17 Update news.md
996.ICU 背后:程序员在互联网公司的真实生态
2019-04-09 15:07:39 +08:00
996icu
655062f3e2 Merge pull request #25332 from houzuquan/master
添加央视新闻(央视新闻客户端)新闻报道
2019-04-09 15:06:10 +08:00
996icu
3204850194 Merge branch 'master' into master 2019-04-09 15:06:02 +08:00
996icu
65548eaae6 Merge pull request #25334 from jeeinn/master
Update news.md
2019-04-09 15:04:08 +08:00
996icu
7bf4945cee Merge branch 'master' into master 2019-04-09 15:03:59 +08:00
996icu
ef4531cfea Merge pull request #25319 from simon300000/patch-3
Update news.md, 改变Markdown格式, 增加Wayback Machine
2019-04-09 15:02:11 +08:00
一颗红心
30ac657d57 Update news.md 2019-04-09 14:33:23 +08:00
侯祖全
2e6ef71a1c 添加央视新闻(央视新闻客户端)新闻报道 2019-04-09 14:10:34 +08:00
jf795926
087dd50b11 Edit conflict 2019-04-09 11:42:25 +08:00
jf795926
134a318181 edit blacklist 2019-04-09 11:40:03 +08:00
simon3000
5c766f171e Update news.md 2019-04-09 11:16:54 +08:00
simon3000
d8625b300e Update news.md 2019-04-09 11:15:38 +08:00
simon3000
b358887f3d Update news.md 2019-04-09 10:54:59 +08:00
996icu
04e1e9c5e1 Merge pull request #25311 from pphdsny/dev/leetcode-java
feat: 添加leetcode-java项目icon
2019-04-09 10:28:29 +08:00
996icu
f999ed7c2f Merge pull request #25314 from cleveralgorithms/master
添加 极客时间 数据分析45讲笔记
2019-04-09 10:28:19 +08:00
996icu
1ca7aa8526 Merge branch 'master' into master 2019-04-09 10:28:12 +08:00
996icu
e91a854e66 Merge pull request #25313 from simon300000/patch-2
Update projects.md 增加996icu-slack-recorder
2019-04-09 10:27:28 +08:00
996icu
39ff1a8116 Merge branch 'master' into patch-2 2019-04-09 10:27:20 +08:00
996icu
770e6e6de3 Merge pull request #25312 from kwuaint/patch-3
better expressions
2019-04-09 10:26:32 +08:00
996icu
666746a5a6 Merge pull request #25310 from Johnny-Wish/master
fix a typo in blacklist.md
2019-04-09 10:26:00 +08:00
Lyfing Chow
51549af184 add Lancoo Group to blacklist 2019-04-09 10:25:55 +08:00
996icu
6d46198880 Merge pull request #25309 from YeDaxia/patch-1
add JApiDocs to anti 996 License
2019-04-09 10:25:32 +08:00
996icu
24877bb21b Merge branch 'master' into patch-1 2019-04-09 10:25:24 +08:00
996icu
a9c37acbe1 Merge pull request #25308 from CPdogson/patch-1
Update README.md 利用对劳动监督部门进行信息公开来督促休息制度的执行
2019-04-09 10:24:42 +08:00
996icu
23a7e16971 Merge pull request #25307 from tranch/patch-1
添加广州创思
2019-04-09 10:24:16 +08:00
996icu
a523aa8910 Merge branch 'master' into patch-1 2019-04-09 10:24:07 +08:00
996icu
386e607439 Merge pull request #25304 from kduxin/duxin
扩充996公司blacklist,增加金杜律师事务所(上海)。
2019-04-09 10:23:37 +08:00
996icu
d3975b2938 Merge branch 'master' into duxin 2019-04-09 10:23:28 +08:00
996icu
24de378971 Merge pull request #25301 from whateverKills/master
列表加入数美科技
2019-04-09 10:22:47 +08:00
996icu
5255f3ea5e Merge branch 'master' into master 2019-04-09 10:22:40 +08:00