Commit Graph

2867 Commits

Author SHA1 Message Date
fd097599a1 Merge branch 'master' into master 2019-04-19 18:58:16 +08:00
5a72d0561a Merge branch 'master' into master 2019-04-19 18:57:13 +08:00
8c2dce5ebd Merge pull request #25649 from zkyne/patch-1
Update README.md
2019-04-19 18:56:37 +08:00
36b792f792 Merge pull request #25678 from 96pzero/master
胡锡进三谈996
2019-04-19 18:55:48 +08:00
a2022abc1e Merge pull request #25676 from JamesZBL/master
优化阅读视觉体验
2019-04-19 18:54:55 +08:00
e8ba8b919d Merge pull request #25672 from zhengyatian/master
delete mocha from whitelist
2019-04-19 18:54:20 +08:00
0a603e51af Merge pull request #25671 from stanfordvan/master
新增whilelist;
2019-04-19 18:54:00 +08:00
a142768de0 Merge pull request #25670 from T-virus-x/master
新增黑名单企业
2019-04-19 18:53:43 +08:00
9c87aa0ede Merge pull request #25666 from juwikuang/patch-4
Use Blockchain to Collect Evidence 用區塊鏈建設網上證據鏈
2019-04-19 18:51:48 +08:00
42ee34b420 Merge pull request #25664 from jackiekoon/master
Update news_EN.md
2019-04-19 18:51:15 +08:00
de511b8b4f Merge pull request #25663 from danielsz/master
Caonima.io, a Clojure powered and Shadowsocks-based VPN solution.
2019-04-19 18:51:02 +08:00
3acbcdb5bb Merge branch 'master' into master 2019-04-19 18:50:49 +08:00
a65af64b4d Merge pull request #25660 from vondear/master
Update README.md
2019-04-19 18:49:11 +08:00
a86403543f Merge branch 'master' into master 2019-04-19 18:48:59 +08:00
3b4e517575 Merge pull request #25656 from hmgqzx/patch-4
ADD FT中文网:从“马云三谈996”窥视中国企业家的内心世界
2019-04-19 18:47:18 +08:00
b779a60694 Merge branch 'master' into patch-1 2019-04-19 18:45:49 +08:00
e176ea47a1 Merge pull request #25680 from chenrulongmaster/master
新增反996项目
2019-04-19 18:44:49 +08:00
a2e110deb9 Merge pull request #25653 from sn99/master
Optimize images
2019-04-19 18:44:11 +08:00
cdf4c9a46e Merge pull request #25652 from ileego/master
新增 新浪财经、每日经济网报道
2019-04-19 18:43:54 +08:00
0ff9aa5e3c Merge pull request #25650 from CPdogson/patch-9
给中文版readme_cn一句话下面介绍多敲了一个回车
2019-04-19 18:43:32 +08:00
bc99586bd3 Merge branch 'master' into patch-9 2019-04-19 18:43:22 +08:00
cbed38135f Merge pull request #25646 from 88250/master
统一 badge 样式
2019-04-19 18:41:14 +08:00
8255fe0ab6 Merge pull request #25645 from Jandaes/patch-1
Update README.md
2019-04-19 18:41:01 +08:00
452b0d28b0 Merge pull request #25644 from living-in-the-moment/master
可以在项目 setting 中添加 Repo Card 了,另外修正一处主页MD语法错误
2019-04-19 18:39:57 +08:00
e1a6e6ee90 Update news.md 2019-04-19 17:40:32 +08:00
96486ae69d Update news.md
胡锡进三谈996
2019-04-19 17:39:28 +08:00
8cae3dfed4 Update news.md
胡锡进三谈996
2019-04-19 17:36:54 +08:00
1ea2054d97 Merge pull request #1 from JamesZBL/JamesZBL-patch-1
优化阅读视觉体验
2019-04-19 15:17:37 +08:00
0df1c71f4b 优化阅读视觉体验
优化阅读视觉体验 - 调整中西文字符间距
2019-04-19 15:17:16 +08:00
7dec142e6e delete mocha from whitelist 2019-04-19 11:39:20 +08:00
wan
d6d947bd15 新增whilelist; 2019-04-19 10:40:54 +08:00
4b4bd14ecf Update README.md 2019-04-19 10:05:40 +08:00
0df52c9cf9 Update README.md 2019-04-19 10:03:33 +08:00
14b67c8bf4 Add files via upload 2019-04-19 09:57:29 +08:00
3f6c55aa90 Delete 92FFE6F8-B0C9-4DE1-B5A1-076AFB98B88B.jpeg 2019-04-19 09:56:11 +08:00
f6e596a10d 修正一处MD格式错误 2019-04-19 09:55:55 +08:00
e5a3b61a57 Add files via upload 2019-04-19 09:06:13 +08:00
5ee086b83d Use Blockchain to Collect Evidence 用區塊鏈建設網上證據鏈
Use Blockchain to Collect Evidence 用區塊鏈建設網上證據鏈
2019-04-19 02:07:12 +08:00
f3eee08f85 Caonima.io, a Clojure powered and Shadowsocks-based VPN solution. 2019-04-18 17:16:37 +03:00
j.k
5ac2ca4bb4 Update news_EN.md 2019-04-18 22:15:42 +08:00
9ebe497682 修改图片格式导致显示异常 2019-04-18 20:51:33 +08:00
48f8e2be29 新增深圳聚力创想信息科技有限公司 2019-04-18 20:47:54 +08:00
09b4cac661 Update README.md 2019-04-18 19:10:35 +08:00
585916ce36 Add new project 2019-04-18 17:43:59 +08:00
9b37aeb03d Merge pull request #1 from 996icu/master
tongbu
2019-04-18 17:33:23 +08:00
b1d044c110 Add files via upload 2019-04-18 17:24:55 +08:00
1e71ca109d ADD FT中文网:从“马云三谈996”窥视中国企业家的内心世界 2019-04-18 16:27:43 +08:00
c0715cc241 Merge pull request #1 from sn99/imgbot
[ImgBot] Optimize images
2019-04-18 13:17:13 +05:30
82619d44b5 [ImgBot] Optimize images
*Total -- 4,108.78kb -> 3,359.36kb (18.24%)

/blacklist/img/劳动合同1 - 副本.jpg -- 426.51kb -> 305.94kb (28.27%)
/blacklist/img/劳动合同2 - 副本.jpg -- 533.55kb -> 391.51kb (26.62%)
/blacklist/img/huawei_hangzhou_timing.png -- 64.14kb -> 48.96kb (23.66%)
/blacklist/img/zftjt.jpg -- 35.94kb -> 28.20kb (21.52%)
/blacklist/img/邻趣工作群截图.jpeg -- 128.92kb -> 102.52kb (20.48%)
/blacklist/img/邻趣工作群截图3.jpeg -- 206.75kb -> 164.61kb (20.38%)
/blacklist/img/邻趣工作群截图2.jpeg -- 173.82kb -> 139.14kb (19.95%)
/blacklist/img/七牛云裁员1.jpg -- 243.90kb -> 197.29kb (19.11%)
/blacklist/img/七牛云裁员2.jpg -- 600.24kb -> 485.85kb (19.06%)
/blacklist/img/七牛云裁员3.jpg -- 472.59kb -> 383.88kb (18.77%)
/blacklist/img/七牛云995.jpg -- 217.29kb -> 185.65kb (14.56%)
/blacklist/img/微信老板认可996 - 副本.jpg -- 109.00kb -> 99.28kb (8.91%)
/blacklist/img/mbgwb.jpg -- 156.20kb -> 142.42kb (8.82%)
/blacklist/img/来画996.png -- 633.64kb -> 585.50kb (7.6%)
/blacklist/img/深圳沈鼓自愿加班承诺书.jpg -- 106.29kb -> 98.59kb (7.25%)
2019-04-18 07:45:29 +00:00
47dcd0225d 新增 新浪财经、每日经济网报道 2019-04-18 14:34:58 +08:00