Commit Graph

2724 Commits

Author SHA1 Message Date
6d0e18c6f2 Merge pull request #25431 from JuiceZZ/master
update blacklist/README.md
2019-04-11 14:49:53 +08:00
a1d9c9f8be Merge branch 'master' into master 2019-04-11 14:49:08 +08:00
5148b14998 Merge pull request #25420 from MosqutitoLiu/remove_bskinblacklist
update blacklist
2019-04-11 14:48:19 +08:00
01ba8617d7 Merge pull request #25441 from 378826474/master
update blacklist
2019-04-11 14:47:01 +08:00
447e2dfa7b Merge pull request #25438 from 378826474/patch-3
Update README.md
2019-04-11 14:43:32 +08:00
f6816816c6 Merge pull request #25426 from ShuueenN/patch-1
Update news.md
2019-04-11 14:42:29 +08:00
7710ab5b69 Merge pull request #25439 from soultipsy/patch-3
Update logo.svg
2019-04-11 14:42:13 +08:00
88ad66c070 Merge pull request #25436 from ravepm/master
增加英文版中的 996.avengers
2019-04-11 14:41:48 +08:00
52ab3a177c Merge pull request #25442 from idealclover/master
add star counting and license showed
2019-04-11 14:39:56 +08:00
de321ce3fe Merge pull request #25437 from aishang5wpj/master
添加人民日报最新评论(报纸)
2019-04-11 14:38:55 +08:00
034523d297 Merge branch 'master' into master 2019-04-11 14:25:23 +08:00
3a6ed04b6a add license 2019-04-11 13:52:38 +08:00
552884bd70 Update and rename blacklist/blacklist.md to 黑名单/blacklist.md 2019-04-11 13:42:30 +08:00
f1e27f551b restore logo 2019-04-11 13:38:43 +08:00
97132ece43 fixed bugs 2019-04-11 13:00:51 +08:00
3f23a41818 fixed bugs 2019-04-11 12:56:13 +08:00
b17b26e055 add star shield 2019-04-11 12:54:31 +08:00
6894f9e313 Update logo.svg
修改了视觉效果,减小体积
2019-04-11 11:43:44 +08:00
c1732b01fe Update blacklist.md 2019-04-11 11:38:31 +08:00
c493d237d1 Add files via upload 2019-04-11 11:38:02 +08:00
733e4c04df Update README.md 2019-04-11 11:30:40 +08:00
46e3f7fd25 Update README.md 2019-04-11 11:20:18 +08:00
b0abda07c4 Update README_CN.md 2019-04-11 11:19:53 +08:00
217ce75b9c Update README_CN.md 2019-04-11 11:18:55 +08:00
b0d779deac Update README.md 2019-04-11 11:18:31 +08:00
03ef0001d4 update:添加人民日报最新评论 2019-04-11 11:17:59 +08:00
f1da7e3faf Update README.md 2019-04-11 11:16:39 +08:00
15b718aa66 Merge pull request #25427 from sxcccc/patch-2
Some names were deleted to protect privacy.
2019-04-11 11:12:42 +08:00
0dbdd3385d Merge branch 'master' into patch-2 2019-04-11 11:12:27 +08:00
5e2f477937 Update README.md 2019-04-11 11:09:33 +08:00
3a91626707 [ImgBot] Optimize images
*Total -- 4,608.34kb -> 3,927.77kb (14.77%)

/blacklist/img/lingzhi1.png -- 15.20kb -> 5.37kb (64.63%)
/awesomelist/img/SecurityPaper.png -- 98.95kb -> 40.87kb (58.7%)
/blacklist/img/tongsi3.png -- 23.77kb -> 12.67kb (46.68%)
/awesomelist/img/data_analysis_icon.png -- 80.48kb -> 43.78kb (45.6%)
/blacklist/img/tongsi4.png -- 51.94kb -> 28.58kb (44.98%)
/whitelist/img/mocha.png -- 122.43kb -> 91.40kb (25.34%)
/blacklist/img/精臣智慧-考勤制度-0.jpg -- 332.59kb -> 269.72kb (18.9%)
/blacklist/img/浙江杭州盘石信息技术有限公司996制度.png -- 58.55kb -> 47.88kb (18.22%)
/blacklist/img/精臣智慧-考勤制度-2.jpg -- 424.83kb -> 353.43kb (16.81%)
/blacklist/img/精臣智慧-考勤制度-1.jpg -- 452.69kb -> 381.30kb (15.77%)
/whitelist/img/gwbn.jpeg -- 194.41kb -> 166.49kb (14.36%)
/blacklist/img/tongsi1.png -- 15.25kb -> 13.11kb (14%)
/whitelist/img/chain33.jpg -- 117.68kb -> 101.79kb (13.5%)
/blacklist/img/蓝鸽集团_聊天记录.png -- 22.66kb -> 19.83kb (12.49%)
/blacklist/img/hikvision_fj.png -- 2,071.78kb -> 1,852.55kb (10.58%)
/blacklist/img/tongsi2.png -- 49.19kb -> 45.64kb (7.22%)
/blacklist/img/精臣智慧-打卡日历.jpg -- 69.58kb -> 64.59kb (7.16%)
/blacklist/img/ecy12.jpg -- 109.46kb -> 102.23kb (6.61%)
/blacklist/img/ecy2.jpg -- 109.46kb -> 102.23kb (6.61%)
/blacklist/img/蓝鸽集团_周末打卡.png -- 187.45kb -> 184.30kb (1.68%)
2019-04-11 03:08:51 +00:00
0b26ef8434 Reformat READEME 2019-04-11 11:08:06 +08:00
9cf8f38801 Merge pull request #25416 from swwl1992/master
add related presses
2019-04-11 11:00:07 +08:00
0f72814801 Merge pull request #25425 from njzjz/imgbot
[ImgBot] Optimize images
2019-04-11 10:59:48 +08:00
313a95db8a Merge pull request #25429 from CPdogson/patch-5
增加996.law的中文翻译
2019-04-11 10:59:37 +08:00
bfa07ebd2c Merge pull request #25432 from HuStmpHrrr/english
correct english
2019-04-11 10:59:14 +08:00
fd97e9eb93 Merge pull request #25434 from fanjun123/master
添加北京长城宽带到白名单
2019-04-11 10:57:46 +08:00
cadb539e86 Merge pull request #25435 from jasonnull/patch-2
Update README.md
2019-04-11 10:57:31 +08:00
957d8e3d90 Reformat README 2019-04-11 10:54:05 +08:00
2c15c81c7f Update README.md 2019-04-11 10:48:15 +08:00
d40d7f4cfd actions 2019-04-10 22:21:28 -04:00
9a1da361fc update blacklist/README.md 2019-04-11 10:21:06 +08:00
8c05692b3b 添加北京长城宽带到白名单 2019-04-11 10:10:39 +08:00
c56edc21e4 Revert "no message"
This reverts commit d8ae167761.
2019-04-11 10:09:17 +08:00
1a6512f534 update:添加人民日报最新评论 2019-04-11 10:07:09 +08:00
d8ae167761 no message 2019-04-11 10:05:02 +08:00
449993da32 Update article_and_discussion.md 2019-04-11 10:02:33 +08:00
d267a11325 Update article_and_discussion.md 2019-04-11 10:01:57 +08:00
4f2aaeda22 Update article_and_discussion.md 2019-04-11 10:01:05 +08:00
8c826a0351 此二人岂可与python之父相提并论
此二人岂可与python之父相提并论
2019-04-11 09:53:47 +08:00