Commit Graph

1666 Commits

Author SHA1 Message Date
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
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
TeCHiScy
57fe1aaebe 更新光明网报道 2019-04-06 17:40:33 +08:00
boycott996
5349d971c3 update README.md, add project Yaocl , 另外一个匿名投票列表
Yaocl 是令一个开源的996公司列表和社区,采用996ICU开源协议,目前支持github登陆,即将支持以太坊匿名登陆
2019-04-06 17:12:26 +08:00
Alvin
d200cab450 Update proposal_To_Request_Github_Official_Including_996ICU_License.md 2019-04-06 16:58:14 +08:00
996icu
c5ae404839 Merge pull request #25225 from asonmine/patch-2
Update new Related reports
2019-04-06 16:33:45 +08:00
996icu
0bf5bd8059 Merge pull request #25224 from viclive/patch-1
fix the pay ratio and some re-wording
2019-04-06 16:33:19 +08:00
996icu
56336ac09c Merge pull request #25223 from xianfengting/issue-2
修改项目AndroidAnti996Browser的简介
2019-04-06 16:32:42 +08:00
Ason
32d602baf0 Update new Related reports
From Reuters:https://motherboard.vice.com/en_us/article/mbz84n/chinese-workers-are-trying-to-bake-fair-labor-practices-into-software
2019-04-06 16:01:55 +08:00
vforv
20219958fa fix the pay ratio and some re-wording
a. 2.275 times (of), not 2.275 times more than - aka 3.275
b. rewording to open secret, enforce etc
2019-04-05 22:57:47 -07:00
996icu
242f7b69e7 Merge pull request #25221 from FrankP1026/master
Update language list
2019-04-06 12:41:21 +08:00
996icu
ac163b7111 Merge pull request #25219 from Tedko/patch-9
Create LICENSE_JP. Work overtime in Japan is also a very severe social problem
2019-04-06 12:40:40 +08:00
996icu
30f3606d11 Merge pull request #25218 from IanvsPoplicola/patch-1
在README里加入维基百科“996工作制”的链接
2019-04-06 12:40:02 +08:00
996icu
f1a34eefc2 Merge pull request #25216 from Tedko/patch-7
增加社区行为准则link
2019-04-06 12:38:23 +08:00
996icu
99a4611fcb Merge pull request #25217 from Tedko/patch-8
add wired report
2019-04-06 12:38:00 +08:00
996icu
84a60006fc Merge pull request #25215 from biubu/master
添加人民日报微博
2019-04-06 12:37:39 +08:00
xianfengting
3b65ce5da9 Modified the description of the AndroidAnti996Browser project. 2019-04-06 12:36:43 +08:00
996icu
ddaa18ae6d Merge pull request #25213 from SamChou19815/master
Added 996-icu-banner
2019-04-06 12:36:30 +08:00
xianfengting
6b138d7816 Merge branch 'master' into issue-2 2019-04-06 12:34:21 +08:00
996icu
140b62959f Merge pull request #25210 from xeviknal/catalan
Adding Catalan to i18n
2019-04-06 12:33:55 +08:00
Frank Pan
38f3bdcb08 add Tagalog to language list 2019-04-05 23:52:17 -04:00