Commit Graph

1499 Commits

Author SHA1 Message Date
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
3bd3ae279d Merge remote-tracking branch 'upstream/master' into local 2019-04-03 14:05:11 +08:00
0b44e5a733 Merge pull request #24999 from NingZelin/patch-1
Update projects.md
2019-04-03 14:04:51 +08:00
63b2ceb5ba 增加空格 2019-04-03 14:03:46 +08:00
574d97717e Merge remote-tracking branch 'upstream/master' into local 2019-04-03 14:03:33 +08:00
e7fd73af34 Merge pull request #25002 from feng88724/patch-1
Update blacklist.md
2019-04-03 14:03:20 +08:00
5767476fbf Merge branch 'master' into local 2019-04-03 14:02:50 +08:00
6c183af486 Merge pull request #4 from 996icu/master
updata
2019-04-03 14:02:48 +08:00
ffdd1c31dc 合并内容 2019-04-03 14:01:33 +08:00
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
af31259201 Merge branch 'master' into master 2019-04-03 13:58:48 +08:00
2c2526a58a Merge pull request #25005 from TheMasterOfMagic/master
在README.md中添加共青团中央公众号相关报道
2019-04-03 13:56:55 +08:00
13de4ebd55 Merge branch 'master' into master 2019-04-03 13:42:27 +08:00
f84e4d9fe3 delete wrong part. 2019-04-03 13:36:51 +08:00
df21d95914 Merge branch 'master' into patch-1 2019-04-03 13:36:44 +08:00
7c98b5790f 在README.md中添加共青团中央公众号相关报道 2019-04-03 13:36:33 +08:00
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
90115a50ea Merge pull request #24990 from PsChina/master
修改格式
2019-04-03 13:12:57 +08:00
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
af8afbd393 Merge remote-tracking branch 'upstream/master' into local 2019-04-03 13:10:28 +08:00
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
b17cc56c6c Merge pull request #24997 from elesos/master
remove projects of starrtc
2019-04-03 13:09:15 +08:00
e913bcb2c8 docs: add zoro pro to projects.md 2019-04-03 13:08:08 +08:00
042241c79f Update projects.md 2019-04-03 12:40:36 +08:00
b5f22e9abf remove projects of starrtc 2019-04-03 12:34:34 +08:00
5826174856 Delete youzu.png 2019-04-03 12:32:49 +08:00
9215a8b08c Update blacklist.md 2019-04-03 12:31:23 +08:00
581f5faed0 加入新闻资讯 2019-04-03 12:19:19 +08:00
2bd7dfc622 resolve conflict 2019-04-03 00:04:23 -04:00
ea873bb142 remove a sentence in en_US that does not exist in zh_CN 2019-04-02 23:54:58 -04:00
67b59a36f1 Update projects.md
add anti 996
2019-04-03 11:53:24 +08:00
778fc90ba9 修改格式
修改 "PsChina" 为 "GitHub/npm"
2019-04-03 11:53:07 +08:00
3135ededea Merge pull request #3 from 996icu/master
updata
2019-04-03 11:48:28 +08:00
128bd2ef6f 加入新闻资讯 2019-04-03 11:37:55 +08:00
5221d98df0 Merge pull request #24988 from Pzoom522/patch-1
fix broken table
2019-04-03 11:27:12 +08:00
b06a783f94 fix broken table
by fixing url @ logo
2019-04-03 11:25:17 +08:00
ef8eba714e Update projects.md 2019-04-03 11:24:00 +08:00
fb7b830b77 Merge pull request #24977 from dragen1860/patch-1
Update projects.md
2019-04-03 11:21:03 +08:00
931afa4a1f Merge branch 'master' into patch-1 2019-04-03 11:20:52 +08:00
46b970f7ac Merge pull request #24974 from LyqSpace/master
[docs] Add a 996.icu licensed project CHOLMOD+Scikit-Sparse+Windows
2019-04-03 11:19:46 +08:00
147a72664b Merge branch 'master' into master 2019-04-03 11:19:37 +08:00
0c46467307 Merge pull request #24987 from Pzoom522/patch-1
Restore MusiCoder to projects.md
2019-04-03 11:17:11 +08:00
3a2b76a900 Merge branch 'master' into patch-1 2019-04-03 11:16:57 +08:00
70a01c4316 Merge pull request #24985 from Coresi7/master
We have fixed license missing problem and request to merge again.
2019-04-03 11:16:18 +08:00
c7cf3bbdcf Merge pull request #24979 from medeen/patch-1
add img close tag
2019-04-03 11:11:43 +08:00
857b28aa05 Merge pull request #24978 from ileego/master
Update README.md
2019-04-03 11:11:21 +08:00
83fb5a0ff0 Merge pull request #24975 from gundamMC/master
Improve en_US sentence structure and grammar
2019-04-03 11:10:39 +08:00
7f1df12cd7 Merge pull request #24971 from njzjz/imgbot
[ImgBot] Optimize images
2019-04-03 11:08:04 +08:00
156cec428a Merge pull request #24970 from AkulaKirov/master
Update README.md
2019-04-03 11:07:48 +08:00