gaspersic/996.ICU
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
996icu
2019-04-11 21:44:34 +08:00
committed by GitHub
parent d55b6e5344 8efb629124
commit 155ebe65eb
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awesomelist/README.md
View File

@@ -135,3 +135,5 @@ Projects under Anti 996ICU License. Thanks for your support!
| - | [nginx-log-rotation](https://github.com/chenrulongmaster/nginx-log-rotation) | [GitHub](https://github.com/chenrulongmaster/nginx-log-rotation) | ![](https://img.shields.io/github/stars/chenrulongmaster/nginx-log-rotation.svg) | Nginx日志滚动 | ![](https://img.shields.io/github/license/chenrulongmaster/nginx-log-rotation.svg) |
| - | [producer-consumer-problem](https://github.com/chenrulongmaster/producer-consumer-problem) | [GitHub](https://github.com/chenrulongmaster/producer-consumer-problem) | ![](https://img.shields.io/github/stars/chenrulongmaster/producer-consumer-problem.svg) | Java 多线程生产者消费者问题 | ![](https://img.shields.io/github/license/chenrulongmaster/producer-consumer-problem.svg) |
| <img src="https://github.com/KyleBing/sslist/blob/master/imgs/logo.png?raw=true" width="60"> | [SSList 小型 GFW list](https://github.com/KyleBing/sslist) | [GitHub](https://github.com/KyleBing/sslist) | ![](https://img.shields.io/github/stars/KyleBing/sslist.svg) | 小型翻墙列表 GFW list，优化速度 | ![](https://img.shields.io/github/license/KyleBing/sslist.svg) |
| - | [DBuilder](https://github.com/lvyahui8/dbuilder) | [GitHub](https://github.com/lvyahui8/dbuilder) | ![](https://img.shields.io/github/stars/lvyahui8/dbuilder.svg) | WEB应用CRUD代码生成器，主要用来生成后台管理数据库的代码 | ![](https://img.shields.io/github/license/lvyahui8/dbuilder.svg) |
| - | [AetherUpload-Laravel](https://github.com/peinhu/AetherUpload-Laravel) | [GitHub](https://github.com/peinhu/AetherUpload-Laravel) | ![](https://img.shields.io/github/stars/peinhu/aetherupload-laravel.svg) | 上传大文件的Laravel扩展 | ![](https://poser.pugx.org/peinhu/aetherupload-laravel/license) |

3
blacklist/README.md
View File

@@ -137,4 +137,5 @@
|北京|[信美人寿相互保险社](https://www.trustlife.com/)|2019年|996|[看准网](https://www.kanzhun.com/gsr5723919.html?ka=com-blocker1-review)、[看准网](https://www.kanzhun.com/gsr6603074.html?ka=com1-review)|
|太原|[辉讯网络技术有限公司](http://www.7zy.net/)|2019年3月|996|亲历 [考勤](https://i.loli.net/2019/04/11/5cae537484b5d.jpg) |
|上海|[上海鱼泡泡信息科技有限公司](https://www.yupaopao.com//)|2018年12月|996|[脉脉](https://maimai.cn/web/gossip_detail?encode_id=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6MjA4NjEwNjcsImlhdCI6MTU1NDk1MDU0OX0.Hd0uP3y9GMnN1OA8fhV0xvCQKT-GBQ33BzUmT1CCavk) |
|武汉|[武汉星云海数字科技股份有限公司](http://www.scotec.net/)|2019年4月|996|[看准网](https://www.kanzhun.com/gso5662099.html)
|武汉|[武汉星云海数字科技股份有限公司](http://www.scotec.net/)|2019年4月|996|[图片](img/hxqc1.jpg)、[图片](img/hxqc2.jpg)、[图片](img/hxqc3.jpg)、[看准网](https://www.kanzhun.com/gso5662099.html)|
|上海|[掌门一对一教育有限公司](https://www.zhangmen.com/)|2019年4月|大小周|[前东家]、[https://www.kanzhun.com/pl7018849.html]

4
externals/news_EN.md vendored
View File

@@ -16,5 +16,5 @@ Related press:
* *Wired:* [How github is helping overworked chinese programmers](https://www.wired.com/story/how-github-helping-overworked-chinese-programmers/). 4 April, 2019.
* *Reuters:* [Rare overtime protest by China tech workers goes viral](https://www.reuters.com/article/us-china-tech-labour/rare-overtime-protest-by-china-tech-workers-goes-viral-idUSKCN1RH12B). 5 April, 2019.
* *Vice:* [Chinese Workers Are Trying to Bake Fair Labor Practices Into Software](https://motherboard.vice.com/en_us/article/mbz84n/chinese-workers-are-trying-to-bake-fair-labor-practices-into-software). 5 April, 2019.
* *Quantz* [How GitHub became a bulletin board for Chinese tech worker complaints](https://qz.com/1589309/996-icu-github-hosts-chinese-tech-worker-complaints/). 9 April, 2019.
* *AsiaOne* [Abusive work schedules in China's tech industry under fire](https://www.asiaone.com/world/abusive-work-schedules-chinas-tech-industry-under-fire). 10 April, 2019.
* *Quantz:* [How GitHub became a bulletin board for Chinese tech worker complaints](https://qz.com/1589309/996-icu-github-hosts-chinese-tech-worker-complaints/). 9 April, 2019.
* *AsiaOne:* [Abusive work schedules in China's tech industry under fire](https://www.asiaone.com/world/abusive-work-schedules-chinas-tech-industry-under-fire). 10 April, 2019.