Merge branch 'master' of github.com:xianfengting/996.ICU

This commit is contained in:
xianfengting
2019-04-13 11:20:20 +08:00
6 changed files with 24 additions and 29 deletions

View File

@@ -1,25 +0,0 @@
Community Code of Conduct
In 996.ICU Repo, I hope everyone who can participate in the community is able to participate in the community here to enjoy the exchange and sharing.
Here we hope you can speak freely, but there may also be some problems and disputes. In order to create a civilized, friendly, safe and happy open-source community, please respect, understand and abide by the community code of conduct.
We value every participant in the open source community. If you suspect that there are violations in the community, please notify us and other community members.
Respect others
996.ICU community respects all participants. You may encounter some different ideas. Please understand. In order to create an open and inclusive environment for all, the words and deeds of the community should respect others, especially:
- Do not publish slander, slander, harassment, threats, incitement, obscenity, pornography and indecent content. For example, do not use foul language or blasphemous language, do not express hatred or intolerance based on the nationality, race, nationality, gender or gender identity of others, religion, sexual orientation, age, or physical inadequacy, and do not publicize organizations with such inappropriate statements.
- Do not publish content that violates the privacy of others. For example, don't disclose other people's phone numbers, e-mails, mailing addresses and other personal information.
- Do not post links to phishing sites and other malicious sites.
- Do not pretend to be someone else or an organization, or to be anything other than yourself.
- Do not send your message or request repeatedly to others.
- Don't try to drown out other people's opinions. Don't use multiple accounts to brush comments or collude with others to publish similar content many times.
- Do not swear or assault.
- You can question the opinions and professionalism of others, provided that your discussions are relevant to the topic and always in a respectful and non-threatening manner.
Prohibition of infringement
- Publishing content or interacting with community members shall not infringe upon other people's intellectual property rights and other rights. You can only publish what you have or have permission to use.
If violations are found, please use the pull request function to contact community members (do not repeat the pull request for the same question).
We will deal with it accordingly. Your participation will help us build a better community. At the same time, the community code of conduct will also continue to improve.

View File

@@ -138,9 +138,12 @@
|太原|[辉讯网络技术有限公司](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|[图片](img/hxqc1.jpg)、[图片](img/hxqc2.jpg)、[图片](img/hxqc3.jpg)、[看准网](https://www.kanzhun.com/gso5662099.html)|
|天津|[北京必胜课教育有限公司-天津部门](https://www.winlesson.com/)|2019年4月|966|[管理规定](img/23123.png)|
|北京|[北京中广创思文化传播有限公司](http://www.cbct.cn/)|2019年4月|996/9107|[图片](img/北京中广创思9107钉钉截图.jpg)
|天津|[北京必胜课教育有限公司-天津部门](https://www.winlesson.com/)|2019年4月|966|[管理规定](img/23123.png)|更新:天津部门私下强制大小周,要求员工保密。|
|福建|[福建浔兴拉链科技股份有限公司](http://www.sbszipper.com/)|2019年4月11日|大小周|亲历+[元旦前考勤注解](img/fjxxydkq.png)[大小周外加周末充当法定节假日外加随意重置大小周顺序-元旦](img/fjxxydfj.png)、[大小周外加周末充当法定节假日外加随意重置大小周顺序-清明节](img/fjxxqmfj.png)|
|上海|[掌门一对一教育有限公司](https://www.zhangmen.com/)|2019年4月|大小周|[看准网](https://www.kanzhun.com/pl7018849.html)|
|北京|[易车网](http://beijing.bitauto.com/)|2019年4月|996|[办公软件截图](img/易车996.png )、[脉脉](img/易车脉脉.png)|
|大连|[大连东软集团](https://www.neusoft.com/cn/)|2019年4月|9106|[看准网](https://www.kanzhun.com/pl5758283.html?ka=review-item2)、[看准网](https://www.kanzhun.com/pl5892120.html?ka=review-item10)|
|北京|[中科曙光](https://www.sugon.com/)|2019年4月|996|有的部门加班到凌晨<br>[牛客网](http://m.nowcoder.com/discuss/61536?type=0&pos=29)、[看准网](https://www.kanzhun.com/pl6092119.html)|
|深圳|[微付充科技有限公司](http://www.vfuchong.com/)|2019年4月|大小周, 每个月固定两天|[职友集](https://www.jobui.com/company/12488776/salary/)

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 679 KiB

View File

@@ -8,7 +8,8 @@ guido
- 人民日报:[“996”工作制该不该消灭](http://t.people.com.cn/discussD.action?topicId=8160)
- ~~有赞CEO 白鸦:[只是聊聊 enjoy](https://mp.weixin.qq.com/s/n13Xbu0HpJaNGW0gYMbpYw)~~
- ~~无码科技 冯大辉(Fenng)[聊聊 996](https://mp.weixin.qq.com/s/Jnt8wM-oCVQppfztxB_KEQ)~~
- 连岳:[说说996自愿的心理治疗功能](https://mp.weixin.qq.com/s?__biz=MjM5NDU0Mjk2MQ%3D%3D&mid=2651633063&idx=1&sn=179e1809e659e92f263d0f7ef4048807)
- 吴晓波:[猛药996背后不能单纯归咎于个体或企业](http://tech.sina.com.cn/csj/2019-04-12/doc-ihvhiewr5126008.shtml)
## 网友讨论
@@ -19,3 +20,19 @@ guido
- 知乎提问:[如何看待程序员在 GitHub 发起抗议互联网公司实行 996 工作制网站?](https://www.zhihu.com/question/317722302)
- 知乎提问:[如何看待996.icu被大公司拦截](https://www.zhihu.com/question/318459753)
- 知乎提问:[如何看待搜狗统计加班时长裁员及王小川的回应?](https://www.zhihu.com/question/318791258)
## 文章评论
- 菁城子,陈兴杰:[如何减少996](https://mp.weixin.qq.com/s?__biz=MjM5ODc2ODA0Mg%3D%3D&mid=2653091740&idx=1&sn=fe5804a4bda3a98f9f6f956a8ede8626)
- 虎嗅网,人神共奋:[为什么“996”成为互联网企业的主流选择](https://www.huxiu.com/article/292377.html)
- caoz的梦呓曹政[关于程序员的996我们谈谈历史和逻辑](https://mp.weixin.qq.com/s/Gz5rBTpMdFkNZUZKlV7D4Q)
- 新闻实验室,川叶:[996.ICU背后程序员在互联网公司的真实生态](https://mp.weixin.qq.com/s?__biz=MjM5NDEwNjQ0MQ%3D%3D&mid=2654281959&idx=1&sn=19105a25ac2c7caa32051333b7d754cf)
- 环球人力资源智库,白睿:[被消失的996.ICU互联网繁华背后的隐忧](https://cj.sina.com.cn/articles/view/2205892054/837b3dd601900g6bq)
- ifanr蒋鸿昌[病态的 996 早需改变,而且不应该只从程序员开始](https://www.ifanr.com/1195365)
## 播客讨论Podcast
- 津津乐道播客:[vol.141 乱槽之癫 · 996.ICU 伤害了谁?](https://jinjinledao.org/?p=900)
- Round Table China[The grueling 996 schedule may put you in the ICU?](https://podcasts.apple.com/cn/podcast/the-grueling-996-schedule-may-put-you-in-the-icu/id793040690?i=1000434658970)
- 比特新声:[180. 被耽误的嘻哈歌手](https://bitvoice.banlan.show/episodes/180)
- 海螺电台 | The Spiral[Episode 003- 漫谈996今天你加班了吗](http://thespiral.fm/episodes/3)

View File

@@ -2,7 +2,7 @@
---
一个提案指的是被 996.ICU 项目接受的建议文档。
通常一个提案应该给出一个能促进项目或社区本身发展的建议或解决方案。
请阅读[提案模板](proposal/proposal_template.md)来了解更多细节。
请阅读[提案模板](proposal_template.md)来了解更多细节。
关于提案部分你可以尝试以下事情来助力996.ICU项目的发展
- 阅读996ICU项目已接受的提案并且尝试提出改进建议。
@@ -13,7 +13,7 @@ Proposals
---
A proposal is a document accepted by 996.ICU.
Typically, a proposal should outline a solution or suggestion about the development of the project and community.
For more details, please read the [proposal template](proposal/proposal_template.md) document.
For more details, please read the [proposal template](proposal_template.md) document.
To help the development of 996.ICU, you can do several things base on proposals.