Commit Graph

1696 Commits

Author SHA1 Message Date
c53fbdd895 fix typos of word 'LICENSE' in instruction.md
I'm (not a supporter;) just dropping by to fix a few typos, which may confuse readers like me
2019-03-31 22:51:40 +08:00
ccd46a7427 Merge pull request #24761 from qiankunpingtai/master
拯救 996 模型畅想
2019-03-31 22:46:41 +08:00
61a50e16b9 Merge pull request #24794 from bofeiw/master
update structure
2019-03-31 22:44:35 +08:00
79e7a13b89 Merge branch 'master' into master 2019-03-31 22:44:23 +08:00
18fc5c28b5 Merge branch 'master' into master 2019-04-01 01:43:45 +11:00
aa538225cb Merge pull request #24737 from juwikuang/patch-2
Update blacklist.md
2019-03-31 22:43:13 +08:00
9075fca8f7 Merge branch 'master' into patch-2 2019-03-31 22:43:00 +08:00
aaf7f84373 Merge pull request #24759 from fengshenyuan/add_proposal_direcotry_and_template
ICUP: Add proposal direcotry and template for 996ICU Projects
2019-03-31 22:41:15 +08:00
95e4032b2d Update blacklist.md
添加证据文件的指引
2019-04-01 01:39:48 +11:00
91c6cce5e5 Merge pull request #24762 from dajun928/master
update blacklist
2019-03-31 22:39:45 +08:00
79eb969fb1 Merge branch 'master' into master 2019-03-31 22:39:00 +08:00
6ce5a05bc3 Merge pull request #24763 from yyrdl/master
【Translation】 修正之前提的PR的英文翻译/Update the translation of 'principle and purpose'
2019-03-31 22:37:42 +08:00
cf5740a42e [update] img转移到blacklist文件夹
- img是黑名单的证据图片,应当属于blacklist这个文件夹
- 黑名单增加证据图片链接
2019-04-01 01:37:31 +11:00
565a45bc74 Merge branch 'master' into master 2019-03-31 22:37:29 +08:00
5f0c62a30d Merge pull request #24766 from ZgblKylin/patch-1
Add instruction for how to use multi-licensing
2019-03-31 22:32:26 +08:00
e8c07a39d6 Merge pull request #24768 from mhcone/patch-1
Update blacklist.md
2019-03-31 22:27:54 +08:00
e6c34b3005 [ImgBot] Optimize images
/archived/assets/images/logo.png -- 8.39kb -> 3.84kb (54.27%)
2019-03-31 14:27:50 +00:00
08faeb3995 Merge branch 'master' into patch-1 2019-03-31 22:27:42 +08:00
475c1c0c82 Merge pull request #24793 from Great-Li-Xin/patch-1
Update en_US.md
2019-03-31 22:24:56 +08:00
daae835df8 Merge pull request #24769 from Tedko/patch-2
Improve the English of README
2019-03-31 22:23:07 +08:00
089a7f0d9e Merge branch 'master' into patch-2 2019-03-31 22:22:52 +08:00
6563e15543 Merge pull request #24770 from bigHugeRabbit/master
新增黑名单企业
2019-03-31 22:21:37 +08:00
152edf0c78 Merge branch 'master' into master 2019-03-31 22:21:25 +08:00
a2a3e340e9 Update en_US.md
Unify Formats and Fix minor mistakes in legal quotes.
2019-03-31 22:16:55 +08:00
f0524d2275 Merge pull request #24775 from MewX/patch-1
Fixed a grammar error
2019-03-31 22:15:33 +08:00
5c764e7bc1 Merge pull request #24776 from cvuuhk/master
Update README.md
2019-03-31 22:15:07 +08:00
97ba643d27 Merge pull request #24779 from LiuChen2015/k-cell
add blacklist
2019-03-31 22:06:01 +08:00
de83bca849 Merge branch 'master' into k-cell 2019-03-31 22:05:43 +08:00
16579e0688 Merge pull request #24781 from BestiOSDev/master
Exposure of a 996 company often working overtime too tired
2019-03-31 22:05:13 +08:00
dc029dbe4f Merge branch 'master' into master 2019-03-31 22:05:01 +08:00
6371eb4bae Merge pull request #24784 from Lax/patch-1
Update LICENSE: Add text identification 参考主流开源协议修改文本换行格式
2019-03-31 22:04:00 +08:00
5ccda26e3c Merge pull request #24786 from bofeiw/master
Update blacklist.md
2019-03-31 22:03:35 +08:00
fdc66bd664 Merge branch 'master' into master 2019-03-31 22:03:25 +08:00
ff6139bb3e Update README.md 2019-03-31 22:01:45 +08:00
e2d4ae1df2 Merge https://github.com/996icu/996.ICU 2019-03-31 22:00:51 +08:00
990086ef42 Merge pull request #24787 from uDp30Z4w/patch-7
Update blacklist.md
2019-03-31 21:55:19 +08:00
7ff3595a17 Update exposure.md 2019-03-31 21:51:16 +08:00
aacc9b33e4 Merge pull request #24746 from ImVictorCheng/patch-1
Modified some expressions and fixed some grammar issues.
2019-03-31 21:20:35 +08:00
7e0b4772f1 Merge pull request #24789 from Abiggg/master
增加黑名单公司
2019-03-31 21:16:29 +08:00
470441bd88 增加黑名单公司“ 2019-03-31 20:31:35 +08:00
abd9cec28f Update externals/rescue.md
修改markdown样式

Co-Authored-By: qiankunpingtai <46507972+qiankunpingtai@users.noreply.github.com>
2019-03-31 19:57:02 +08:00
ee1ef79b94 Update blacklist.md 2019-03-31 19:38:03 +08:00
3bb0732d39 Update blacklist.md
|杭州|[智贝信息科技有限公司](https://www.zhipin.com/gongsi/09aefd7a9d507c2f1nd82tu9Ew~~.html)|2019年3月|强制996、歧视程序员|[程序员吐槽:薪资低,996加班无补助,歧视程序员,这hr真乃神人](https://baijiahao.baidu.com/s?id=1627625016599313128)|
2019-03-31 22:29:30 +11:00
a92aff7aa2 Update LICENSE 2019-03-31 18:04:10 +08:00
da36b73f98 Update LICENSE
Add text identification
2019-03-31 18:01:39 +08:00
cefffcfdb1 Exposure of a 996 company often working overtime too tired 2019-03-31 16:35:53 +08:00
8bb2d3ba8c 拯救 996 的配方,以部分加粗的方式突出重点 2019-03-31 16:09:09 +08:00
f05bb31784 Merge branch 'master' of https://github.com/996icu/996.ICU 2019-03-31 16:07:27 +08:00
940a486d43 add 武汉氪细胞 2019-03-31 15:30:33 +08:00
a5f5a3f519 add 武汉氪细胞 2019-03-31 15:19:44 +08:00