Commit Graph

1800 Commits

Author SHA1 Message Date
6199508f99 添加观察者网报道
这篇报道十分详细,甚至介绍了996的起源和发展,更难能可贵的是在最后一段指出了国内浏览器厂商对这个项目页面的屏蔽
2019-04-05 23:28:20 +08:00
2b9f130e31 Update news.md
add 联合早报
2019-04-05 23:12:33 +08:00
28ad7cbaa1 Update whitelist.md
Add whitelist company
2019-04-05 22:59:21 +08:00
b9a446d795 Create tg_TG.md
Tagalog version
2019-04-05 10:32:14 -04:00
e57a3aa0a7 doc(readme): add new entry for report from reuters 2019-04-05 16:22:21 +02:00
725b5b5400 Create Community_Rules_CN.md
add a community_rule in CN
2019-04-05 21:55:44 +08:00
8d3b356d2f Merge pull request #25196 from lingt-xyz/patch-1
Reformat: remove line breaks and white spaces
2019-04-05 21:54:44 +08:00
544b5bb25d Reformat: remove line breaks and white spaces
Remove unnecessary line breaks and white spaces.
2019-04-05 09:46:34 -04:00
9201a0b914 Merge pull request #25193 from gophpercloud/master
Globalegrow, a 996 company in ShenZhen
2019-04-05 20:29:35 +08:00
7de6d94afe Merge pull request #25192 from panjf2000/master
Get licenses' names from reading the licenses dir dynamically
2019-04-05 20:29:22 +08:00
7d069f22ca Update README.md
Remove 996.TSC due to profit misunderstandings
2019-04-05 20:28:43 +08:00
8491a875d2 Update README_CN.md
Remove 996.TSC due to profit misunderstandings
2019-04-05 20:28:24 +08:00
a48d3aef52 Get licenses name from reading the licenses dir dynamically 2019-04-05 20:00:23 +08:00
959d5840a8 Globalegrow, a 996 company in ShenZhen 2019-04-05 19:44:48 +08:00
5b0087569b Update news.md 2019-04-05 17:46:36 +08:00
918281c3e7 Merge pull request #25185 from UCC-team/master
add blacklist
2019-04-05 17:45:51 +08:00
0d8f6d6930 Merge branch 'master' into master 2019-04-05 17:45:42 +08:00
b810b68a10 Merge pull request #25190 from fasiondog/master
remove my project
2019-04-05 17:45:12 +08:00
acdde8147e remove my project 2019-04-05 17:32:24 +08:00
8769d74a7d Merge pull request #25188 from Tedko/patch-5
Create LICENSE_zh-Hant (繁体中文)
2019-04-05 17:24:04 +08:00
177592d24b Merge pull request #25186 from OskarZhang/patch-1
Update blacklist.md
2019-04-05 17:23:21 +08:00
1363033ff6 Merge pull request #25187 from iamybj/patch-6
Update blacklist.md
2019-04-05 17:23:00 +08:00
ecf0dae686 Merge pull request #25189 from rpfbl/master
Update news reports
2019-04-05 17:22:10 +08:00
5d9e592548 Update news.md 2019-04-05 16:47:00 +08:00
002fe9f5f6 Create LICENSE_zh-Hant 2019-04-05 16:46:37 +08:00
3bd17f6866 Update blacklist.md 2019-04-05 16:18:46 +08:00
9a2a1482fa Update blacklist.md 2019-04-05 00:33:24 -07:00
75e0fcd276 [ImgBot] Optimize images
/whitelist/img/chillyroom_prove.png -- 316.68kb -> 215.49kb (31.96%)
2019-04-05 07:01:43 +00:00
f9ac6e4f80 Merge pull request #25182 from rpfbl/master
Update news reports
2019-04-05 14:19:19 +08:00
UCC
2999f75981 Update blacklist.md 2019-04-05 14:10:56 +08:00
UCC
ea3574b1f0 Update blacklist.md 2019-04-05 14:09:37 +08:00
647be115cf Merge pull request #25183 from VitalyAnkh/master
Add more function
2019-04-05 14:08:08 +08:00
524ab7581a Update news.md 2019-04-05 13:33:30 +08:00
b094bd86e8 add more function to test tools 2019-04-05 13:31:30 +08:00
23d05fea82 Update news.md 2019-04-05 13:28:34 +08:00
6bac4103f7 Update news.md 2019-04-05 13:27:37 +08:00
4b89e20397 Update news.md 2019-04-05 13:27:05 +08:00
80cc632ce1 Merge pull request #3 from 996icu/master
keep update again and again
2019-04-05 13:22:28 +08:00
6a58f740cc Update news.md 2019-04-05 13:17:19 +08:00
57f2700ae9 Merge pull request #25178 from VitalyAnkh/master
Add tools to test the license generators
2019-04-05 13:14:44 +08:00
f4e8d636cd Merge pull request #25177 from DANaini13/master
添加白名单公司
2019-04-05 13:11:34 +08:00
e2a644469f Merge pull request #25179 from hannsu/master
Update README_CN.md
2019-04-05 13:11:02 +08:00
cb8caac109 rm .idea 2019-04-05 13:08:30 +08:00
3ef348ee02 rm .idea 2019-04-05 13:06:50 +08:00
659919d6ff Update README_CN.md 2019-04-05 13:06:18 +08:00
3455d1220b 添加白名单公司 2019-04-05 13:04:54 +08:00
e2726780b3 add tools tester 2019-04-05 13:03:15 +08:00
2889346fcb Merge pull request #2 from 996icu/master
keep update again
2019-04-05 13:02:45 +08:00
dae727563a Merge pull request #25172 from znone/patch-2
Update projects.md
2019-04-05 13:00:20 +08:00
baef19e350 Merge branch 'master' into patch-2 2019-04-05 13:00:13 +08:00