Commit Graph

1709 Commits

Author SHA1 Message Date
xiaofei
29d820e98f Add news.md
更新 news.md,添加国内爱否科技对 996.ICU 项目的报道
2019-04-08 09:05:23 +08:00
996icu
2aeda45942 Merge pull request #25265 from nybbs2003/patch-2
Create logo.svg
2019-04-07 23:33:52 +08:00
996icu
2250dd77ad Merge pull request #25263 from MRNIU/patch-2
Update projects.md
2019-04-07 23:32:47 +08:00
996icu
6f5a116ff4 Merge pull request #25262 from Pearyman/master
update blacklist
2019-04-07 23:32:28 +08:00
996icu
3f84080e40 Merge pull request #25260 from bofeiw/news
Add news
2019-04-07 23:31:02 +08:00
996icu
122719addc Merge pull request #25259 from Aneureka/patch-2
Update projects.md
2019-04-07 23:30:48 +08:00
David Zhang
5bae0c3d7e Update logo.svg 2019-04-07 22:28:53 +08:00
David Zhang
7f5f94f3a4 Update logo.svg 2019-04-07 22:28:28 +08:00
David Zhang
c8763233e2 Create logo.svg
Create SVG version of project logo , and released to Public Domain
2019-04-07 22:23:17 +08:00
Zone.N
4887ed1f72 Update projects.md
Revise text formatting
2019-04-07 21:46:54 +08:00
yanan lee
515a924b63 update blacklist 2019-04-07 21:41:47 +08:00
yanan lee
7baec25029 update blacklist 2019-04-07 21:38:02 +08:00
bofeiw
cdc1fdb0db Add news 2019-04-07 23:14:01 +10:00
Hiki
31133365e7 Update projects.md 2019-04-07 20:51:24 +08:00
996icu
6a6851a9b9 Merge pull request #25258 from HenryQW/master
revert: official translation of the Constitution
2019-04-07 20:47:43 +08:00
Henry
dbd6e594d0 revert: official translation of the Constitution 2019-04-07 13:43:33 +01:00
996icu
56fb402b43 Merge pull request #25251 from dhcn/master
Update projects.md
2019-04-07 20:00:59 +08:00
996icu
2f3d54d5a0 Merge branch 'master' into master 2019-04-07 20:00:45 +08:00
996icu
9d15c1c9e0 Merge pull request #25257 from fasiondog/master
add project to 996
2019-04-07 20:00:08 +08:00
996icu
8a3c4b1cdc Merge branch 'master' into master 2019-04-07 19:59:56 +08:00
996icu
3cc57e49e3 Merge pull request #25256 from ChuangSheep/patch-1
Create Proposal_for_Expanding_the_Anti996License_for_more_Fields.md
2019-04-07 19:59:28 +08:00
996icu
53d77c306a Merge pull request #25254 from MRNIU/patch-1
Add SimpleKernel to  awesomelist
2019-04-07 19:59:06 +08:00
996icu
277ee1178b Merge branch 'master' into patch-1 2019-04-07 19:58:55 +08:00
996icu
6d3a64480e Merge pull request #25253 from jerrywdlee/add_project
add new project into awesomelist
2019-04-07 19:58:25 +08:00
fasiondog
b4604140dd add project to 996 2019-04-07 19:04:27 +08:00
ChuangSheep
9c3e945390 Create Proposal_for_Expanding_the_Anti996License_for_more_Fields.md
提交新提案
建议将Anti 996 License拓展到更多领域
2019-04-07 12:19:29 +02:00
Zone.N
de1fe21cd0 Add SimpleKernel to awesomelist 2019-04-07 17:49:26 +08:00
Jerry Lee
6b8d8592f3 add no-cron 2019-04-07 18:05:19 +09:00
dhcn
cefaf299f0 Update projects.md 2019-04-07 12:58:41 +08:00
996icu
f01c875cf3 Merge pull request #25250 from microhz/master
add news and remove invalid whitelist
2019-04-07 12:45:43 +08:00
996icu
ac6ec9f3b1 Merge pull request #25248 from deepgrace/master
add logo
2019-04-07 12:45:28 +08:00
996icu
f5bacff1b5 Merge pull request #25246 from cjim8889/master
Change of a incorrect source of news
2019-04-07 12:45:14 +08:00
996icu
7380a34a05 Merge pull request #25245 from fengT-T/patch-2
提交 996 公司列表
2019-04-07 12:45:02 +08:00
feng
62a2c65b63 Update blacklist.md
删除重复提交的公司,并帮上次提交的老哥美化链接
2019-04-07 12:38:46 +08:00
micro
74555407aa remove invalid list 2019-04-07 11:46:19 +08:00
micro
21d51a58a7 revert 2019-04-07 11:35:34 +08:00
micro
9a8554a4ee add news 2019-04-07 11:30:22 +08:00
micro
96116be49a Merge branch 'master' of https://github.com/microhz/996.ICU 2019-04-07 11:24:28 +08:00
deepgrace
e4f17821d1 add logo 2019-04-07 09:22:00 +08:00
deepgrace
beb8c98cf8 Merge pull request #1 from 996icu/master
merge from upstream
2019-04-07 08:34:20 +08:00
Wuhao Chen
e49267fad9 Change of incorrect news source
"Chinese Workers Are Trying to Bake Fair Labor Practices Into Software" This piece of news should be attributed to Vice rather than Reuters.
2019-04-06 21:29:12 +01:00
feng
7d644fcedb Update blacklist.md
添加url
2019-04-07 03:51:18 +08:00
feng
832923ff29 提交 996 公司列表
根据 匿名投票列表和抓取看准的评论和知乎搜索,暂时就随手找了这么多,有准确描述996关键字和讲述工作时间的我都给加上了
2019-04-07 03:23:46 +08:00
996icu
60181edea7 Merge pull request #25244 from ohhhhyaa/master
Update blacklist.md
2019-04-07 01:25:21 +08:00
996icu
aedc6f0d97 Merge pull request #25243 from jack80342/master
添加两个Anti 996项目:Thymeleaf-Reference-Guide与Spring-Boot-Reference-Guide
2019-04-07 01:25:06 +08:00
996icu
5bbed2eae5 Merge pull request #25242 from iamybj/patch-7
修改网址
2019-04-07 01:24:54 +08:00
996icu
89def0e037 Merge pull request #25241 from xxoxx-233/master
update:水军高端漂白
2019-04-07 01:24:04 +08:00
Nemesis
d659ced300 Update blacklist.md
添加杭州海康威视,杭州大华,杭州宇视这三个安防巨头加班证据
2019-04-07 00:53:21 +08:00
Nemesis
cb94021bcf Merge pull request #3 from 996icu/master
update repo
2019-04-07 00:31:51 +08:00
Zhong Zengqiang
8562ba0577 解决冲突 2019-04-06 23:47:03 +08:00