Commit Graph

1918 Commits

Author SHA1 Message Date
6be47f1951 添加忽略内容 2019-04-10 09:37:00 +08:00
7f4f7dcf44 Merge remote-tracking branch 'upstream/master' into local 2019-04-10 09:35:08 +08:00
d74de6d249 Merge pull request #25374 from Cynthia7979/master
修改英文版介绍并添加链接
2019-04-10 09:32:54 +08:00
efe742f65a Merge pull request #25372 from JKetelaar/master
Added Dutch translation
2019-04-10 09:31:48 +08:00
023468ff36 Merge pull request #25371 from jzhzj/patch-1
Revised a format error
2019-04-10 09:31:29 +08:00
c01303c811 Merge pull request #25370 from xloypaypa/master
试图添加对非开发人员相对友好的教程,以方便他们能参与进来。
2019-04-10 09:31:13 +08:00
3da63e532f Merge branch 'master' into local 2019-04-10 09:30:48 +08:00
4033469686 Merge pull request #25368 from vipwzw/master
没有996就无法在竞争中取得优势吗?
2019-04-10 09:28:31 +08:00
c99c51bc93 修改部分词语 2019-04-09 19:24:12 -04:00
e474baccef 增加句子通顺性,添加原文链接 2019-04-09 15:00:40 -04:00
527d7391ba Added Dutch language 2019-04-09 13:11:07 -05:00
0fbd8c6a6b Fixed markdown issue 2019-04-09 13:10:39 -05:00
abcf81396d Fixed markdown 2019-04-09 13:09:39 -05:00
cef75dca96 Fixed link 2019-04-09 13:08:54 -05:00
f5177e3260 Fixed layout 2019-04-09 13:08:17 -05:00
5a48fe97b5 Fixed layout 2019-04-09 13:05:03 -05:00
36a4f138c4 Added Dutch translation 2019-04-09 13:03:34 -05:00
08d16beec4 Revised a format error 2019-04-09 13:12:13 -04:00
65f7e805eb Update whitelist.md 2019-04-10 00:30:38 +08:00
54b5240167 试图添加对非开发人员相对友好的教程,以方便他们能参与进来。 2019-04-10 00:17:42 +08:00
9f42d60e73 Update README_CN.md 2019-04-10 00:10:33 +08:00
0dd4e72d19 添加白名单 2019-04-10 00:08:44 +08:00
24c26bbd4c Update README_CN.md 2019-04-09 23:14:15 +08:00
54b453b6b8 Update README_CN.md 2019-04-09 23:13:59 +08:00
bda3311167 Update README.md 2019-04-09 22:42:19 +08:00
fedb2fafb0 Merge pull request #25322 from leaforbook/master
添加支持远程工作的公司列表
2019-04-09 22:41:45 +08:00
7003b22617 Merge pull request #25366 from 996browser/patch-1
Update projects.md
2019-04-09 22:40:02 +08:00
57132267c6 Create supporters.md 2019-04-09 22:33:48 +08:00
4b68f4d3cc Update projects.md
Add 996.BROWSER
2019-04-09 22:31:48 +08:00
f4a62f1716 Update README_CN.md 2019-04-09 22:16:56 +08:00
d13c86627a Update README.md 2019-04-09 22:16:33 +08:00
c6aad9ce91 Merge pull request #25365 from tinytian/patch-2
Change “reports” to “press”.
2019-04-09 22:16:04 +08:00
8b89290872 Merge pull request #25364 from zhanggh8023/patch-1
增加南方都市报报道
2019-04-09 22:15:51 +08:00
aef49094c4 Merge pull request #25325 from Sam618/patch-1
Update projects.md
2019-04-09 22:14:45 +08:00
31d8a307ab Merge pull request #25336 from sunquanunice/patch-1
Add a reuters article for this subject
2019-04-09 22:14:28 +08:00
02d9d931f0 Merge pull request #25333 from lloydzhou/patch-1
在招聘网站给公司添加996ICU标签
2019-04-09 22:14:09 +08:00
ce7c529d76 Merge branch 'master' into patch-1 2019-04-09 22:13:53 +08:00
eb79c8162d Change “reports” to “press”. 2019-04-09 22:13:32 +08:00
78c7215cfe Merge pull request #25330 from SecurityPaper/master
SecurityPaper项目修改开源授权许可协议
2019-04-09 22:13:02 +08:00
eda2ff6c69 Merge branch 'master' into patch-1 2019-04-09 22:12:38 +08:00
27851de42b Merge pull request #25316 from CPdogson/patch-3
将996.action信息公开行动的翻译
2019-04-09 22:09:56 +08:00
0dc8c8008c Merge pull request #25317 from lufan0820/master
增加996公司名单
2019-04-09 22:09:18 +08:00
858f59eb2e Merge branch 'master' into master 2019-04-09 22:08:41 +08:00
63c2f8f0e7 Merge pull request #25360 from xloypaypa/master
建议加入其他工种的文件夹。
2019-04-09 22:05:48 +08:00
5da189a697 Merge pull request #25358 from edwardfhsiao/patch-1
Update projects.md. Support Anti996 License.
2019-04-09 22:05:04 +08:00
8e18690c23 Merge branch 'master' into patch-1 2019-04-09 22:04:53 +08:00
a6af8f462f Merge pull request #25359 from zouqianghtml/master
关于996-最新新闻
2019-04-09 22:04:30 +08:00
0776bfa0be Merge pull request #25357 from zhengyatian/master
update whitelist.
2019-04-09 22:03:37 +08:00
87695a5999 Merge pull request #25356 from ZedeX/patch-2
Update LICENCE - 增加“暗示”
2019-04-09 22:02:59 +08:00
21826c8190 Merge pull request #25354 from ZedeX/patch-1
Update LICENCE - include "metaphor"
2019-04-09 22:01:35 +08:00