Commit Graph

1460 Commits

Author SHA1 Message Date
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
74e848fe54 Restore MusiCoder to projects.md
Which somehow disappear since last pull request (#24967)
https://github.com/Pzoom522/MusiCoder
2019-04-03 10:19:13 +08:00
5f254446d2 add img close tag 2019-04-03 09:08:33 +08:00
cc265147c6 Update README.md 2019-04-03 09:01:34 +08:00
43c4941475 Update projects.md 2019-04-03 11:53:10 +11:00
fe7faf6c26 Update en_US.md
Improve sentence structure and fix grammar.
2019-04-02 16:50:18 -07:00
e7ececbe39 [docs] Add a 996.icu licensed project CHOLMOD+Scikit-Sparse+Windows 2019-04-02 16:51:37 -05:00
c25116dfb0 Update README.md 2019-04-03 00:57:00 +08:00
4db7f81eb0 Merge pull request #2 from 996icu/master
Pull and merge newest code.
2019-04-03 00:41:59 +08:00
fd4369b667 Merge pull request #24967 from idealclover/master
Unify format in awesomelist
2019-04-03 00:41:30 +08:00
9329c999cb Merge branch 'master' into master 2019-04-03 00:40:42 +08:00
994ea61888 update projects.md 2019-04-03 00:36:37 +08:00
d4f27bfb96 Merge branch 'master' of https://github.com/996icu/996.ICU 2019-04-03 00:21:08 +08:00
8a56acbbdc fixed logo width 2019-04-03 00:18:33 +08:00
12bd6cb379 fixed project links 2019-04-03 00:09:58 +08:00
157fae2e84 docs: Update projects.MD 2019-04-02 23:58:32 +08:00
d4581e8f92 Merge pull request #24963 from Pzoom522/master
add MusiCoder
2019-04-02 23:39:07 +08:00
77c1bbecfd add MusiCoder
https://github.com/Pzoom522/MusiCoder
2019-04-02 22:45:12 +08:00
d10df3b5cc Add project 2019-04-02 21:38:21 +08:00
360f2a21a2 [ImgBot] Optimize images
*Total -- 25.09kb -> 11.88kb (52.67%)

/blacklist/img/chat2.png -- 4.02kb -> 1.59kb (60.36%)
/blacklist/img/chat3.png -- 8.49kb -> 3.61kb (57.52%)
/blacklist/img/chat1.png -- 12.58kb -> 6.67kb (46.95%)
2019-04-02 13:36:13 +00:00
c58538cabf Merge pull request #24958 from fasiondog/master
补充 hikyuu项目 logo
2019-04-02 21:26:21 +08:00
d51b4e0bc7 Merge pull request #24959 from 1977474741/master
Update projects.md
2019-04-02 21:26:01 +08:00
e2ac80d91a Merge branch 'master' into master 2019-04-02 21:25:49 +08:00
e489e05d8c Merge pull request #24960 from CN-YUANYU/order
请注意加入996License的秩序
2019-04-02 21:25:07 +08:00
0990385035 请注意秩序 2019-04-02 21:12:51 +08:00
7fc5f76485 Update projects.md 2019-04-02 21:06:34 +08:00
5dc3953076 Delete rescue.md 2019-04-02 20:56:50 +08:00
f895f43f79 Merge pull request #24952 from alex7931/jp-readme
修正一些语法错误
2019-04-02 20:56:14 +08:00
de6517de88 Merge pull request #24957 from 1977474741/master
更新projects.md
2019-04-02 20:55:38 +08:00