Commit Graph

2874 Commits

Author SHA1 Message Date
8c2b0908ad Merge pull request #24717 from dolsup/patch-1
Update i18n.md
2019-03-30 18:22:18 +08:00
93353ff3a3 Merge pull request #24720 from xingfanxia/master
Fix english translation
2019-03-30 18:20:26 +08:00
09993f515e fix english translation 2019-03-30 02:50:11 -07:00
a1782b0594 Merge branch '996icu-master' 2019-03-30 02:43:01 -07:00
a21ec12506 dl file 2019-03-30 02:42:47 -07:00
4ca7db4632 Update i18n.md
update the link for Korean to new file
2019-03-30 18:11:04 +09:00
c6c82b240e Update blacklist.md 2019-03-30 16:50:18 +08:00
e9bee33dae Merge pull request #24706 from Great-Li-Xin/patch-1
Update en_US.md
2019-03-30 16:17:30 +08:00
06e0e263b2 Merge pull request #24711 from njzjz/patch-3
modify HTML style to Markdown style
2019-03-30 16:06:54 +08:00
7be0dce506 Merge pull request #24710 from dolsup/master
fix Korean translation
2019-03-30 16:01:25 +08:00
133a7b9ef7 modify HTML style to Markdown style 2019-03-30 16:00:41 +08:00
283616fc0c Merge pull request #24707 from njzjz/patch-1
Avoid linking to 996 website
2019-03-30 15:52:30 +08:00
d0c2bf7771 fix Korean translation 2019-03-30 16:36:25 +09:00
12aac1d687 Avoid linking to 996 website 2019-03-30 15:32:24 +08:00
0036698bd9 Update en_US.md
修正语法错误与调整用词。
Grammatical corrections and word adjustments.
2019-03-30 15:29:54 +08:00
9ced6ab0ee Merge branch 'master' of https://github.com/996icu/996.ICU 2019-03-30 14:50:33 +08:00
19f86ba2fc Update zh-Hans.md 2019-03-30 14:50:10 +08:00
e18c8f5c07 Update zh-Hans.md 2019-03-30 14:49:41 +08:00
57641160de Merge pull request #24675 from fengT-T/patch-1
add 996.LIST
2019-03-30 14:32:55 +08:00
96b168b8ed Merge pull request #24702 from bofeiw/master
readme增加license描述
2019-03-30 14:28:11 +08:00
ed799d6cfb Merge pull request #24701 from Simon-Leung/Simon-Leung-patch-zh_lzh-hans
修复 zh-lzh-Hans.md 语法问题
2019-03-30 14:20:18 +08:00
d8bc5a6461 Merge pull request #24699 from YixinChenn/patch-1
Update blacklist.md
2019-03-30 14:20:10 +08:00
360a137664 Merge pull request #24694 from stevenlei/master
add cantonese translation
2019-03-30 14:18:53 +08:00
6276d3ded1 Merge pull request #24693 from iamybj/patch-4
更新证据材料
2019-03-30 14:18:19 +08:00
64d43e991a Merge pull request #24692 from Roy-Mao/review_jp_readme
Review和更新日文readme
2019-03-30 14:17:42 +08:00
121700fab7 readme增加license描述 2019-03-30 17:15:32 +11:00
8b99201ce3 Merge pull request #24631 from HenryQW/master
增加部分法规英文及排版,增加已上市 996 公司股票代码
2019-03-30 14:09:36 +08:00
1468ff78ec Renamed to zh-Hans.md 2019-03-30 14:09:17 +08:00
8b42434a63 Update README.md 2019-03-30 14:07:50 +08:00
ed499d0f85 Update zh-lzh-Hans.md
修复语法问题
2019-03-30 14:05:31 +08:00
89c54f0312 Merge pull request #24700 from bofeiw/master
修复996 badge链接
2019-03-30 14:05:12 +08:00
45407a8d9c Merge pull request #2 from 996icu/master
sync
2019-03-30 14:03:55 +08:00
e711d185af Merge pull request #24627 from uDp30Z4w/patch-8
Remind of blind digital watermarking
2019-03-30 14:01:00 +08:00
4b278ef00d 修复996 badge链接
原链接502,换到新链接
2019-03-30 16:55:11 +11:00
1e1eb8ed8d Update blacklist.md 2019-03-30 13:53:01 +08:00
2277a73a73 Merge pull request #24591 from liuchuzhang/patch-1
Format Chinese
2019-03-30 13:51:06 +08:00
661394c5fb Merge pull request #24587 from Pearyman/master
Fix ga.md markdown links
2019-03-30 13:46:44 +08:00
b792128687 Merge pull request #24696 from AmazingChen/master
correct the syntax
2019-03-30 13:41:54 +08:00
062234d0e7 Merge pull request #24697 from pra85/patch-1
Change licencee to licensee
2019-03-30 13:41:05 +08:00
ba18344144 Update README.md 2019-03-30 13:39:27 +08:00
60bc9d3f5b Change licencee to licensee
Change `licencee` to `licensee`

Within GitHub, usage of the word is `licencee` very uncommon ( 4,000 instances - https://github.com/search?q=licencee&type=Code) as compared to `licensee` (5,000,000 instances - https://github.com/search?q=licensee&type=Code)

Also, refer to https://english.stackexchange.com/questions/34350/
2019-03-30 11:07:26 +05:30
8e6bb6764c Create instruction.md 2019-03-30 13:37:17 +08:00
159b9558be Merge pull request #24677 from XUJINKAI/patch-2
添加一个指向996.icu的badge,并鼓励人们添加到自己的readme中
2019-03-30 13:27:09 +08:00
3a910b1646 Merge pull request #24686 from lylaiety/master
Update blacklist.md
2019-03-30 13:25:29 +08:00
76d9ac70b4 Merge branch 'master' into master 2019-03-30 13:25:17 +08:00
d6cb6fdbf2 Merge pull request #24690 from uDp30Z4w/patch-5
Modify the blacklist
2019-03-30 13:23:10 +08:00
d9dbeef6f0 新增黑名单企业与证据材料 2019-03-30 13:19:54 +08:00
15314eb83e Merge pull request #24685 from bofeiw/master
删除无效信息
2019-03-30 13:16:34 +08:00
35e5464940 correct the syntax 2019-03-30 13:11:19 +08:00
Roy
d89d6627db 这应该是一个粗心的typo 2019-03-30 13:53:12 +09:00