Commit Graph

1718 Commits

Author SHA1 Message Date
a4a58e5a1c Update README_CN.md 2019-04-08 10:50:33 +08:00
b1b399e9ba Merge pull request #25273 from MyFaith/master
update blacklist
2019-04-08 10:44:45 +08:00
db3cd2c832 update blacklist 2019-04-08 10:40:57 +08:00
c8a8cdd8ab Merge pull request #25269 from wildfirechat/master
添加开源IM
2019-04-08 10:39:12 +08:00
a0f60bb885 Merge pull request #25261 from gotobeta/article_and_discussion
add article and discussion links
2019-04-08 09:23:58 +08:00
6f34dff3ad 添加开源IM 2019-04-08 09:23:34 +08:00
ab4a40050d Merge pull request #25268 from xiaofei-dev/patch-1
Add news.md
2019-04-08 09:23:10 +08:00
29d820e98f Add news.md
更新 news.md,添加国内爱否科技对 996.ICU 项目的报道
2019-04-08 09:05:23 +08:00
2aeda45942 Merge pull request #25265 from nybbs2003/patch-2
Create logo.svg
2019-04-07 23:33:52 +08:00
2250dd77ad Merge pull request #25263 from MRNIU/patch-2
Update projects.md
2019-04-07 23:32:47 +08:00
6f5a116ff4 Merge pull request #25262 from Pearyman/master
update blacklist
2019-04-07 23:32:28 +08:00
3f84080e40 Merge pull request #25260 from bofeiw/news
Add news
2019-04-07 23:31:02 +08:00
122719addc Merge pull request #25259 from Aneureka/patch-2
Update projects.md
2019-04-07 23:30:48 +08:00
5bae0c3d7e Update logo.svg 2019-04-07 22:28:53 +08:00
7f5f94f3a4 Update logo.svg 2019-04-07 22:28:28 +08:00
c8763233e2 Create logo.svg
Create SVG version of project logo , and released to Public Domain
2019-04-07 22:23:17 +08:00
4887ed1f72 Update projects.md
Revise text formatting
2019-04-07 21:46:54 +08:00
515a924b63 update blacklist 2019-04-07 21:41:47 +08:00
7baec25029 update blacklist 2019-04-07 21:38:02 +08:00
bd13ad4964 update article title 2019-04-07 21:23:10 +08:00
79a0b9b8f4 add article and discussion links 2019-04-07 21:16:37 +08:00
cdc1fdb0db Add news 2019-04-07 23:14:01 +10:00
31133365e7 Update projects.md 2019-04-07 20:51:24 +08:00
6a6851a9b9 Merge pull request #25258 from HenryQW/master
revert: official translation of the Constitution
2019-04-07 20:47:43 +08:00
dbd6e594d0 revert: official translation of the Constitution 2019-04-07 13:43:33 +01:00
56fb402b43 Merge pull request #25251 from dhcn/master
Update projects.md
2019-04-07 20:00:59 +08:00
2f3d54d5a0 Merge branch 'master' into master 2019-04-07 20:00:45 +08:00
9d15c1c9e0 Merge pull request #25257 from fasiondog/master
add project to 996
2019-04-07 20:00:08 +08:00
8a3c4b1cdc Merge branch 'master' into master 2019-04-07 19:59:56 +08:00
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
53d77c306a Merge pull request #25254 from MRNIU/patch-1
Add SimpleKernel to  awesomelist
2019-04-07 19:59:06 +08:00
277ee1178b Merge branch 'master' into patch-1 2019-04-07 19:58:55 +08:00
6d3a64480e Merge pull request #25253 from jerrywdlee/add_project
add new project into awesomelist
2019-04-07 19:58:25 +08:00
b4604140dd add project to 996 2019-04-07 19:04:27 +08:00
9c3e945390 Create Proposal_for_Expanding_the_Anti996License_for_more_Fields.md
提交新提案
建议将Anti 996 License拓展到更多领域
2019-04-07 12:19:29 +02:00
de1fe21cd0 Add SimpleKernel to awesomelist 2019-04-07 17:49:26 +08:00
6b8d8592f3 add no-cron 2019-04-07 18:05:19 +09:00
cefaf299f0 Update projects.md 2019-04-07 12:58:41 +08:00
f01c875cf3 Merge pull request #25250 from microhz/master
add news and remove invalid whitelist
2019-04-07 12:45:43 +08:00
ac6ec9f3b1 Merge pull request #25248 from deepgrace/master
add logo
2019-04-07 12:45:28 +08:00
f5bacff1b5 Merge pull request #25246 from cjim8889/master
Change of a incorrect source of news
2019-04-07 12:45:14 +08:00
7380a34a05 Merge pull request #25245 from fengT-T/patch-2
提交 996 公司列表
2019-04-07 12:45:02 +08:00
62a2c65b63 Update blacklist.md
删除重复提交的公司,并帮上次提交的老哥美化链接
2019-04-07 12:38:46 +08:00
74555407aa remove invalid list 2019-04-07 11:46:19 +08:00
21d51a58a7 revert 2019-04-07 11:35:34 +08:00
9a8554a4ee add news 2019-04-07 11:30:22 +08:00
96116be49a Merge branch 'master' of https://github.com/microhz/996.ICU 2019-04-07 11:24:28 +08:00
e4f17821d1 add logo 2019-04-07 09:22:00 +08:00
beb8c98cf8 Merge pull request #1 from 996icu/master
merge from upstream
2019-04-07 08:34:20 +08:00
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