Commit Graph

1887 Commits

Author SHA1 Message Date
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
iamybj
08e12a01d6 修改网址
修改网址
2019-04-06 23:41:06 +08:00
xxoxx-233
a1b328c9bd update:水军高端漂白 2019-04-06 23:31:36 +08:00
热心市民钟小强
db928ff7b6 Update projects.md 2019-04-06 23:24:32 +08:00
996icu
fad78ee982 Merge pull request #25227 from boycott996/master
update README.md, add project YAOCL, 另外一个匿名投票列表
2019-04-06 23:13:46 +08:00
996icu
eb2e926b4b Merge pull request #25230 from deepgrace/deepgrace-patch-1
submit new projects
2019-04-06 23:10:39 +08:00
996icu
a0429566ba Merge branch 'master' into deepgrace-patch-1 2019-04-06 23:10:30 +08:00
996icu
e9975a8413 Merge pull request #25237 from shuspieler/patch-1
support 996.icu
2019-04-06 23:09:48 +08:00
996icu
be74d4179e Merge pull request #25240 from dragon-yuan/master
Add chinese news to master
2019-04-06 23:09:13 +08:00
996icu
9f84b1e11f Merge branch 'master' into master 2019-04-06 23:09:04 +08:00
996icu
0db4e51ddc Merge pull request #25239 from martin-yin/patch-2
vue-color-ui 项目名称修改
2019-04-06 23:07:28 +08:00
996icu
3368bbaf11 Merge pull request #25236 from simon300000/patch-1
Update news.md 增加爱范儿报导
2019-04-06 23:05:22 +08:00
996icu
acd8b45aa7 Merge pull request #25233 from ohhhhyaa/master
update README.md
2019-04-06 23:04:12 +08:00
996icu
5cff26a1fe Merge pull request #25229 from TeCHiScy/master
更新光明网报道
2019-04-06 22:55:56 +08:00
996icu
f5f67450f4 Merge pull request #25228 from njzjz/imgbot
[ImgBot] Optimize images
2019-04-06 22:55:38 +08:00
996icu
541423c9ea Merge pull request #25226 from zhangjile/patch-1
Update proposal_To_Request_Github_Official_Including_996ICU_License.md
2019-04-06 22:55:02 +08:00
dragon
1f330e502c Add chinese news to master 2019-04-06 21:51:14 +08:00
Martin
e549ea8e2f vue-color-ui 项目名称修改
vue-color-ui 项目名称修改成 Pipi-Dinosaur。
logo地址添加
2019-04-06 20:56:21 +08:00
simon3000
f2b3433685 Update news.md 2019-04-06 20:36:54 +08:00
Shuspieler
3492756948 support 996.icu 2019-04-06 14:35:17 +02:00
Nemesis
a9ac45fb75 Update README.md 2019-04-06 19:32:18 +08:00
Nemesis
15efca92ad Merge branch 'master' into master 2019-04-06 19:29:58 +08:00
deepgrace
2d14b508bd typo fix 2019-04-06 18:59:10 +08:00
deepgrace
fcdde9234e submit new projects 2019-04-06 18:52:40 +08:00