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

Merge remote-tracking branch 'upstream/master' into local

Browse Source
This commit is contained in:
Changeden
2019-04-03 13:10:28 +08:00
parent 581f5faed0 b3e0fd6307
commit af8afbd393
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awesomelist/projects.md
View File

@ -37,8 +37,6 @@ Projects under 996ICU License. Thanks for your support!
| - | [easy-filter](https://github.com/PsChina/easy-filter) | [PsChina](https://github.com/PsChina) | vue2.x 过滤器插件 | | - | [easy-filter](https://github.com/PsChina/easy-filter) | [PsChina](https://github.com/PsChina) | vue2.x 过滤器插件 |
| - | [Vueg](https://github.com/jaweii/Vueg----page-transition-plugin) | [Github](https://github.com/jaweii/Vueg----page-transition-plugin) | Page level transition plugin for vue-router| | - | [Vueg](https://github.com/jaweii/Vueg----page-transition-plugin) | [Github](https://github.com/jaweii/Vueg----page-transition-plugin) | Page level transition plugin for vue-router|
| - | [one](https://github.com/lizhichao/one) | [Github](https://github.com/lizhichao/one) | 一个极简的高性能常驻内存php框架| | - | [one](https://github.com/lizhichao/one) | [Github](https://github.com/lizhichao/one) | 一个极简的高性能常驻内存php框架|
| <img src="https://github.com/elesos/image/raw/master/starrtc.png" width="60"> | [starRTC](https://github.com/starrtc/starrtc-server) |[starRTC](https://starRTC.com)| 免费IM，免费视频通话，免费视频会议，免费直播连麦服务端 |
| <img src="https://github.com/elesos/image/raw/master/starrtc.png" width="60"> | [starRTC](https://github.com/starrtc/starrtc-android-demo) |[starRTC](https://starRTC.com)| 免费IM，免费视频通话，免费视频会议，免费直播连麦安卓客户端 |
| - | [vue-color-ui](https://github.com/martin-yin/vue-color-ui) | [Github](https://github.com/martin-yin/vue-color-ui) | 微信小程序color-ui的vue版本 | | - | [vue-color-ui](https://github.com/martin-yin/vue-color-ui) | [Github](https://github.com/martin-yin/vue-color-ui) | 微信小程序color-ui的vue版本 |
| - | [WxJava](https://github.com/Wechat-Group/WxJava) | [Github](https://github.com/Wechat-Group/WxJava) | 微信开发 Java SDK| | - | [WxJava](https://github.com/Wechat-Group/WxJava) | [Github](https://github.com/Wechat-Group/WxJava) | 微信开发 Java SDK|
| - | [cyclone](https://github.com/simpleapples/cyclone) | [Github](https://github.com/simpleapples/cyclone) | Cyclone is a go package to spawn, reuse and manage a number of goroutines by a pool. | | - | [cyclone](https://github.com/simpleapples/cyclone) | [Github](https://github.com/simpleapples/cyclone) | Cyclone is a go package to spawn, reuse and manage a number of goroutines by a pool. |

2
blacklist/blacklist.md
View File

@ -36,7 +36,7 @@
|深圳|[华为](https://www.huawei.com/cn/)|2010年8月|9106|[华为：“自愿”的奋斗者协议](http://focus.news.163.com/10/0921/15/6H460OOP00011SM9.html)| |深圳|[华为](https://www.huawei.com/cn/)|2010年8月|9106|[华为：“自愿”的奋斗者协议](http://focus.news.163.com/10/0921/15/6H460OOP00011SM9.html)|
|杭州|[阿里巴巴](https://www.alibabagroup.com/)|2018年6月|996|[阿里巴巴的996加班文化，看到这些恐怖数据，你也会辞职！](https://kuaibao.qq.com/s/20180612A1FAPU00)| |杭州|[阿里巴巴](https://www.alibabagroup.com/)|2018年6月|996|[阿里巴巴的996加班文化，看到这些恐怖数据，你也会辞职！](https://kuaibao.qq.com/s/20180612A1FAPU00)|
|杭州|[蚂蚁金服](https://www.antfin.com/)|2018年11月|9106|[阿里前员工吐槽：从蚂蚁金服离职了，真的拿员工当蚂蚁使](https://t.cj.sina.com.cn/articles/view/6680234487/18e2c49f700100dq3q)| |杭州|[蚂蚁金服](https://www.antfin.com/)|2018年11月|9106|[阿里前员工吐槽：从蚂蚁金服离职了，真的拿员工当蚂蚁使](https://t.cj.sina.com.cn/articles/view/6680234487/18e2c49f700100dq3q)|
|北京|[京东](https://www.jd.com)|2019年3月|995|[京东回应995工作制：不会强制要求 但要全情投入](http://tech.163.com/19/0312/13/EA2QGIOK00097U7R.html)| |北京|[京东](https://www.jd.com)|2019年3月|995|[京东回应995工作制：不会强制要求 但要全情投入](http://tech.163.com/19/0312/13/EA2QGIOK00097U7R.html)<br>[刘强东内部邮件称要淘汰或协商解决掉“三种人”](https://i.loli.net/2019/04/02/5ca2e8727f213.jpg)|
|北京|[58同城](https://www.58.com)|2016年9月|996|[58同城实行全员996工作制 被指意图逼员工主动辞职](http://finance.cnr.cn/gs/20160901/t20160901_523105136.shtml)| |北京|[58同城](https://www.58.com)|2016年9月|996|[58同城实行全员996工作制 被指意图逼员工主动辞职](http://finance.cnr.cn/gs/20160901/t20160901_523105136.shtml)|
|南京|[苏宁](http://www.suning.com)|2019年3月|996|[如何评价今年苏宁正式实行996工作制?](https://www.zhihu.com/question/314152843/answer/613149536)| |南京|[苏宁](http://www.suning.com)|2019年3月|996|[如何评价今年苏宁正式实行996工作制?](https://www.zhihu.com/question/314152843/answer/613149536)|
|北京|[途家网](https://www.tujia.com)|2017年12月|897|[加班邮件、诉讼材料](https://iamybj.github.io/tujia/)| |北京|[途家网](https://www.tujia.com)|2017年12月|897|[加班邮件、诉讼材料](https://iamybj.github.io/tujia/)|