Commit Graph

2164 Commits

Author SHA1 Message Date
5fbc3bdf62 Merge pull request #1 from 996icu/master
merge
2019-04-04 15:37:38 +08:00
74448bc99e Update README_CN.md 2019-04-04 15:31:21 +08:00
e621bc2cb1 Update README.md 2019-04-04 15:31:01 +08:00
b73150a95b Rename README_EN.md to README.md 2019-04-04 15:29:56 +08:00
a6a1f94c55 Rename README.md to README_CN.md 2019-04-04 15:29:39 +08:00
cca241f6d7 Delete LICENSE_zh-Hant
Traditional Chinese Area, Please use English version.
2019-04-04 15:27:52 +08:00
fd99cd83ac Merge pull request #25111 from ProjectStaging/master
Update blacklist.md
2019-04-04 15:23:35 +08:00
96f6ad266b Merge pull request #25115 from djokovicwang/master
Update and rename ANTI_996_DAY.MD to ANTI-996 DAY.MD
2019-04-04 15:20:05 +08:00
2ea16528b3 Merge pull request #25116 from rpfbl/master
Slack
2019-04-04 15:19:41 +08:00
7b920cc7ab Merge pull request #25110 from dhmemi/master
Chinese Version -> "中文版“
2019-04-04 15:19:05 +08:00
24f0f545b9 Modification of typo. 2019-04-04 15:14:18 +08:00
8fa99c61b1 更正:好奇者日报→好奇心日报 2019-04-04 15:12:29 +08:00
8a4fdb10bb 添加好奇者日报 2019-04-04 15:05:15 +08:00
031b28737a Update and rename ANTI_996_DAY.MD to ANTI-996 DAY.MD
Modify the English description of ANTI-996 DAY
2019-04-04 15:04:53 +08:00
5ba27b1340 Merge branch 'master' into master 2019-04-04 15:03:02 +08:00
18f1769c20 Add one project more. 2019-04-04 14:59:58 +08:00
6a0036d5d9 Chinese Version -> "中文版“ 2019-04-04 14:43:47 +08:00
79a5d3d11a Update blacklist.md 2019-04-04 14:42:45 +08:00
4980f1b1dd Update README.md 2019-04-04 14:28:34 +08:00
a002f6df2d Update README.md 2019-04-04 14:28:10 +08:00
fe75cbd04c Create news.md 2019-04-04 14:25:32 +08:00
66e4ae03e4 Merge pull request #25109 from giantss/master
新增相关报道
2019-04-04 14:21:13 +08:00
8b1c5ec2cd Merge pull request #25107 from djokovicwang/master
modify media links
2019-04-04 14:20:41 +08:00
6f8b2631ac 新增相关报道 2019-04-04 14:03:15 +08:00
4753665437 Update README_EN.md
delete duplicate links
2019-04-04 13:57:16 +08:00
f1d1fd56cc Update README_EN.md
delete duplicate links
2019-04-04 13:56:42 +08:00
7022b0b390 Update README.md 2019-04-04 13:55:53 +08:00
a59c16378d Update README_EN.md
delete duplicate links
2019-04-04 13:55:17 +08:00
790e76ed31 Update README.md
华尔街见闻 -> 全天候科技
2019-04-04 13:53:46 +08:00
1ceeafb28e Merge pull request #25105 from xiaozeng6/master
Update blacklist.md
2019-04-04 13:52:07 +08:00
170af5ce3a Merge branch 'master' into master 2019-04-04 13:51:55 +08:00
9c614acfa2 Merge pull request #25106 from Tedko/patch-4
Create LICENSE_zh-Hant *(繁体中文)
2019-04-04 13:51:08 +08:00
19bcdac449 Merge pull request #25096 from chenyixin8854/master
撤销
2019-04-04 13:50:04 +08:00
b0093f0e62 Merge branch 'master' into master 2019-04-04 13:49:52 +08:00
217e0b36d0 Create LICENSE_zh-Hant
Thanks for the contribute from Prof. Ju Chun Ko https://github.com/dAAAb and Ason https://github.com/asonmine
2019-04-04 13:46:14 +08:00
74f8821f66 Merge pull request #25101 from fengshenyuan/update_the_readme_chinese_translation
更新README中关于提案部分的翻译
2019-04-04 13:46:09 +08:00
cc988ecb43 Merge pull request #25099 from FrankP1026/master
Showing Finnish in the original language, correct the name of Vietnamese
2019-04-04 13:45:22 +08:00
354bcdedc2 Merge pull request #25097 from OnlyMoon/Branch_master_add_blacklist
update blacklist.md
2019-04-04 13:44:13 +08:00
ffc7e17d91 Merge branch 'master' into Branch_master_add_blacklist 2019-04-04 13:43:42 +08:00
64308ec81f Merge pull request #25094 from MouriNaruto/master
从反996许可证列表中移除NSudo
2019-04-04 13:41:27 +08:00
8cdd9b0bd0 Merge pull request #25091 from gaoyaoxin/patch-2
Added 7 more reports up to 3 April with publishing dates
2019-04-04 13:38:24 +08:00
4a7f81f74d Merge branch 'master' into patch-2 2019-04-04 13:38:10 +08:00
6c405ce62c Merge pull request #25090 from huzhongying3/master
Update blacklist.md
2019-04-04 13:37:18 +08:00
ade23e834e Merge pull request #25088 from huangjiehua/master
Update whitelist.md
2019-04-04 13:36:02 +08:00
3e359c046d Merge pull request #25087 from Czxck001/patch-2
Add report by Financial Times
2019-04-04 13:34:51 +08:00
2171ac0dc5 Merge pull request #25086 from wuyc/master
fix url
2019-04-04 13:34:20 +08:00
abf0006fc5 Merge pull request #25084 from gershonv/patch-2
add 为 awesomelist/projects.md 添加项目
2019-04-04 13:32:54 +08:00
1ccec20fa1 Update blacklist.md 2019-04-04 13:32:47 +08:00
b3161dfa5c showing the names of Vietnamese and Finnish in original languages 2019-04-04 00:10:05 -04:00
11147ade11 Merge branch 'master' into Branch_master_add_blacklist 2019-04-04 11:58:14 +08:00