Commit Graph

1254 Commits

Author SHA1 Message Date
996icu
f708b4b467 Merge pull request #25025 from Julyme/patch-1
Adding my project to "awesomelist"
2019-04-03 19:20:16 +08:00
996icu
8f353930a1 Merge branch 'master' into patch-1 2019-04-03 19:20:06 +08:00
996icu
f3174d9524 Merge pull request #25027 from Ruikoto/patch-1
Update blacklist.md
2019-04-03 19:18:14 +08:00
996icu
1714c6497c Merge branch 'master' into patch-1 2019-04-03 19:18:02 +08:00
996icu
8a49a928c4 Merge pull request #25028 from ileego/master
南方日报:正视年轻人压力“爆棚”的危险
2019-04-03 19:17:13 +08:00
996icu
a0310fbc00 Merge branch 'master' into master 2019-04-03 19:16:49 +08:00
996icu
982f63e138 Merge pull request #25033 from zowiegong/update-readme
相关报道格式调整
2019-04-03 19:14:04 +08:00
996icu
dc60148cc3 Merge pull request #25036 from chenyixin8854/master
坚决抵制
2019-04-03 19:11:32 +08:00
996icu
c1e02475eb Merge pull request #25037 from ChanpleCai/patch-1
Update projects.md
2019-04-03 19:10:57 +08:00
996icu
28d2ffb2b0 Merge pull request #25038 from Franklxs/patch-1
Update whitelist.md
2019-04-03 19:10:29 +08:00
Franklxs
22bc2fa7b8 Update whitelist.md 2019-04-03 18:57:09 +08:00
Chanple
90ead489b3 Update projects.md
Add SmartTaskbar Project
2019-04-03 18:11:18 +08:00
chenxin5
e736f63b0f 坚决抵制 2019-04-03 17:50:17 +08:00
waynegong
665686c471 update reademe 2019-04-03 17:20:42 +08:00
ileego
dda87558a6 Update README.md 2019-04-03 16:44:06 +08:00
ileego
e3401db691 Update README.md
南方日报:正视年轻人压力“爆棚”的危险
2019-04-03 16:40:16 +08:00
ileego
aabf8b3c8f Update README.md 2019-04-03 16:38:02 +08:00
ileego
e9ac5fbb6e Update README.md 2019-04-03 16:37:19 +08:00
ileego
63abda11cf Update README.md
南方日报:正视年轻人压力“爆棚”的危险
2019-04-03 16:36:04 +08:00
Ruikoto
bb5b9a3da7 Update blacklist.md
修复“北京关键科技股份有限公司”处的"图片-1"指向错误
2019-04-03 16:23:54 +08:00
Julyme
68a96a68b4 Adding my project to "awesomelist"
Adding my project to "awesomelist"
2019-04-03 15:59:12 +08:00
996icu
8387b48216 Merge pull request #25009 from PsChina/master
增加空格
2019-04-03 14:12:26 +08:00
996icu
b3cc6e1143 Merge pull request #24996 from victor647/patch-3
Delete youzu.png
2019-04-03 14:09:25 +08:00
996icu
46aad32df1 Merge pull request #24995 from victor647/patch-2
Update blacklist.md
2019-04-03 14:09:14 +08:00
996icu
e905419d47 Merge pull request #24991 from xixifeng/patch-1
Add project under 996ICU License
2019-04-03 14:08:19 +08:00
996icu
57029d6d5d Merge pull request #24992 from FrankP1026/master
Remove a sentence in en_US that does not exist in zh_CN
2019-04-03 14:07:53 +08:00
996icu
0b44e5a733 Merge pull request #24999 from NingZelin/patch-1
Update projects.md
2019-04-03 14:04:51 +08:00
shanshan
63b2ceb5ba 增加空格 2019-04-03 14:03:46 +08:00
996icu
e7fd73af34 Merge pull request #25002 from feng88724/patch-1
Update blacklist.md
2019-04-03 14:03:20 +08:00
shanshan
6c183af486 Merge pull request #4 from 996icu/master
updata
2019-04-03 14:02:48 +08:00
996icu
ac61192f21 Merge pull request #25006 from epicGeek/master
Split the origin README to Chinese and English README versions to make it easy to read and manage.
2019-04-03 13:58:58 +08:00
996icu
af31259201 Merge branch 'master' into master 2019-04-03 13:58:48 +08:00
996icu
2c2526a58a Merge pull request #25005 from TheMasterOfMagic/master
在README.md中添加共青团中央公众号相关报道
2019-04-03 13:56:55 +08:00
epicgeek
13de4ebd55 Merge branch 'master' into master 2019-04-03 13:42:27 +08:00
Neil Pei
f84e4d9fe3 delete wrong part. 2019-04-03 13:36:51 +08:00
xixifeng
df21d95914 Merge branch 'master' into patch-1 2019-04-03 13:36:44 +08:00
TheMasterOfMagic
7c98b5790f 在README.md中添加共青团中央公众号相关报道 2019-04-03 13:36:33 +08:00
Neil Pei
4be34c1fcf split Chinese and English to 2 readmes 2019-04-03 13:33:10 +08:00
幻影浪子
5f0f3dd22b Update blacklist.md
有一家公司写错啦,很明显不是“苏州科技城”。
2019-04-03 13:25:34 +08:00
996icu
90115a50ea Merge pull request #24990 from PsChina/master
修改格式
2019-04-03 13:12:57 +08:00
996icu
8ab69ade6a Merge pull request #25000 from FaureWu/feat/yaochen-update-projects
docs: add zoro pro to projects.md
2019-04-03 13:10:47 +08:00
996icu
b3e0fd6307 Merge pull request #24998 from stdcode/master
Evidence of Liu Qiangdong's intention to lay off staff
2019-04-03 13:09:43 +08:00
996icu
b17cc56c6c Merge pull request #24997 from elesos/master
remove projects of starrtc
2019-04-03 13:09:15 +08:00
yaochen
e913bcb2c8 docs: add zoro pro to projects.md 2019-04-03 13:08:08 +08:00
NingZelin
042241c79f Update projects.md 2019-04-03 12:40:36 +08:00
elesos
b5f22e9abf remove projects of starrtc 2019-04-03 12:34:34 +08:00
Victor Liu 刘子奇
5826174856 Delete youzu.png 2019-04-03 12:32:49 +08:00
Victor Liu 刘子奇
9215a8b08c Update blacklist.md 2019-04-03 12:31:23 +08:00
Frank Pan
2bd7dfc622 resolve conflict 2019-04-03 00:04:23 -04:00
Frank Pan
ea873bb142 remove a sentence in en_US that does not exist in zh_CN 2019-04-02 23:54:58 -04:00