Commit Graph

2444 Commits

Author SHA1 Message Date
cfe3b35a32 添加多尺寸LOGO图片,添加Sketch文件,添加repo_card.png 2019-04-18 10:51:53 +08:00
7d9618df0e Merge pull request #25641 from ileego/master
新增 经济日报:挥别“996”,从今天开始
2019-04-18 09:23:44 +08:00
1c9167cdcb Merge pull request #25631 from iBreaker/master
修复markdown语法错误
2019-04-18 09:23:20 +08:00
a71b52f4ae Merge pull request #25634 from x5engine/patch-1
Fix english
2019-04-18 09:22:36 +08:00
2e865378c7 Merge pull request #25635 from swwl1992/master
update blacklist
2019-04-18 09:22:02 +08:00
b98b1a1d1a 新增 经济日报:挥别“996”,从今天开始 2019-04-18 09:21:56 +08:00
428011b639 Merge pull request #25636 from wenqinlong/patch-1
Update README.md
2019-04-18 09:21:45 +08:00
18e273fc84 Merge pull request #25640 from filipefilardi/patch-1
Fix typos and grammar
2019-04-18 09:21:00 +08:00
d1e9431b0f Fix typos and grammar 2019-04-17 21:59:51 -03:00
e54dd01ee3 Update README.md
Edit the format. 易点天下 and 深圳市世纪纵横科技发展有限公司
2019-04-17 14:54:22 -04:00
16263e2f4d update blacklist 2019-04-17 23:51:28 +08:00
689f67adef Fix english 2019-04-17 16:25:28 +01:00
dab7ca754a update 2019-04-17 22:42:58 +08:00
68028f170e 修复markdown语法错误 2019-04-17 22:39:58 +08:00
186ac719f7 Merge pull request #1 from 996icu/master
merge
2019-04-17 22:31:24 +08:00
aad5e28573 update 2019-04-17 22:29:26 +08:00
1cad1fe21b Merge pull request #25629 from KuBiBot/master
update
2019-04-17 21:23:50 +08:00
5d5a4873e4 Merge branch 'master' into master 2019-04-17 21:23:38 +08:00
ab349b1ed2 Merge pull request #25627 from calon/article
补充Podcast讨论节目
2019-04-17 21:22:36 +08:00
da74eb5dde Merge pull request #25624 from njzjz/imgbot
[ImgBot] Optimize images
2019-04-17 21:21:44 +08:00
1fcae3f917 Merge pull request #25622 from onlyGuo/master
Feat: add Nginx GUI to awesome.
2019-04-17 21:21:07 +08:00
7bf7e712d3 Merge pull request #25621 from HZNUTech/master
添加果壳文章
2019-04-17 21:20:51 +08:00
f0a61ce237 Merge pull request #25620 from hvariant/patch-1
fix LICENSE grammar
2019-04-17 21:20:33 +08:00
01f6bdf2bd Merge pull request #25619 from ileego/master
增加 人民网:遏制“996” 需要劳动监察部门发力
2019-04-17 21:20:02 +08:00
e468ca91f9 Merge pull request #25617 from yanjin99/order-blacklist-by-city
黑名单列表按城市排列以便于查看
2019-04-17 21:19:21 +08:00
b5db585e13 Merge branch 'master' into order-blacklist-by-city 2019-04-17 21:19:11 +08:00
f6c095b64e Merge pull request #25614 from cjim8889/master
Improve grammatical consistency
2019-04-17 21:15:30 +08:00
76f7f3c227 Merge pull request #25612 from amphineko/master
fix blacklist typo
2019-04-17 21:14:47 +08:00
6ae4ecec13 Merge pull request #25607 from CPdogson/patch-8
在我能做什么下面加入“信息公开”
2019-04-17 21:13:30 +08:00
056ebcec4f Merge pull request #25606 from LiwangEric/patch-1
Update README.md
2019-04-17 21:12:48 +08:00
b32bf4f5c7 Merge pull request #25604 from fatBuou/master
update blacklist
2019-04-17 21:12:33 +08:00
e553d8a124 Merge branch 'master' into master 2019-04-17 21:12:18 +08:00
004c4bb11e Merge pull request #25591 from Ongcoi/Ongcoi-patch-2
Add Aosatech evidence
2019-04-17 21:11:40 +08:00
7c7c40e89e Merge branch 'master' into Ongcoi-patch-2 2019-04-17 21:11:23 +08:00
0f93aaa81a update 2019-04-17 18:26:57 +08:00
0cce043c2e Podcast 2019-04-17 17:35:26 +08:00
70fd807b67 修复markdown语法错误 2019-04-17 13:06:27 +08:00
gsk
8fc1ae31e5 add Nginx GUI to awesome. 2019-04-17 12:46:46 +08:00
7238981678 Add article by 果壳:想要996的老板们,等待你们的恐怕是全司集体摸鱼 2019-04-17 10:28:12 +08:00
617129b56e Update LICENSE
fix grammar. metaphor is not a verb.
2019-04-17 11:45:13 +10:00
98b3d69b8c 增加 人民网:遏制“996” 需要劳动监察部门发力 2019-04-17 09:10:19 +08:00
541ae1e594 黑名单列表按城市排列以便于查看 2019-04-16 15:08:31 -05:00
c82e33cdf4 Update README.md
Improve grammatical consistency.
2019-04-16 17:52:58 +01:00
d6e804de03 Merge pull request #2 from 996icu/master
Merge
2019-04-16 17:52:10 +01:00
9310a13463 Merge pull request #1 from amphineko/typo-fix
fix blacklist typo
2019-04-17 00:05:35 +08:00
21a1d8afd0 fix blacklist typo 2019-04-17 00:05:12 +08:00
35acd40bfd 在我能做什么下面加入“信息公开”
“信息公开”事宜将于2019年4月20日进行一次线上会议,希望可以在这个位置做一个显眼的广告,为期3天。希望更多人愿意参加。
2019-04-16 22:33:25 +08:00
1537b63397 Update README.md 2019-04-16 21:34:38 +08:00
c11cf31633 Merge pull request #1 from 996icu/master
从fork来源处更新源码
2019-04-16 19:16:59 +08:00
e2a7efe09e Merge pull request #25603 from 996icu/revert-25602-master
Revert "更新 hits badge"
2019-04-16 19:16:03 +08:00