Commit Graph

1460 Commits

Author SHA1 Message Date
133dbdf687 Merge branch 'master' into master 2019-04-02 14:31:59 +08:00
16a0bb975f Merge pull request #24905 from TimothyYe/master
add new project
2019-04-02 14:31:26 +08:00
7da4fd71d8 Merge branch 'master' into master 2019-04-02 14:31:16 +08:00
8b99a3a795 awesomelist加入资产文件夹 2019-04-02 14:30:15 +08:00
66505be26a Merge pull request #24908 from GerryIsWarrior/patch-1
Update projects.md
2019-04-02 14:29:05 +08:00
568f71d598 合并master 2019-04-02 14:28:08 +08:00
2c42862a5d 优化资源 2019-04-02 14:27:47 +08:00
d4e0d308b0 更新 游族网络 加班制度 2019-04-02 14:12:16 +08:00
098d495f55 添加了游族网络 加班制度 2019-04-02 14:10:44 +08:00
820c97c29a 新增 反 996 许可证 的项目-BAButton 2019-04-02 13:51:04 +08:00
cdc69e4dcf [docs] add two anti-996 projects 2019-04-02 13:50:43 +08:00
e8bdaed63f Reformat doc: remove redundant blank line and convert tab to space 2019-04-02 13:49:08 +08:00
7cf3e70cc1 Update projects.md
add project
2019-04-02 13:44:33 +08:00
2f11e962fe add new project 2019-04-02 13:16:23 +08:00
1261a2bb59 Evidence of Liu Qiangdong's intention to lay off staff 2019-04-02 12:47:28 +08:00
2b3a591327 Merge pull request #24875 from elesos/master
add license 4 days ago, may the first project add 996 license
2019-04-02 12:30:21 +08:00
f11399bee7 Merge branch 'master' into master 2019-04-02 12:29:57 +08:00
a26ec8ef52 Merge pull request #24898 from binarywang/patch-3
Update projects.md
2019-04-02 12:27:02 +08:00
16ecdf195e Merge pull request #24900 from MosqutitoLiu/add_blacklist
add blacklist-北京必胜课教育科技有限公司
2019-04-02 12:26:44 +08:00
17ab767c4b Merge pull request #24901 from 0xZhangKe/patch-1
add 2 project
2019-04-02 12:25:46 +08:00
02d564a56a Merge pull request #24899 from binarywang/patch-4
移除重复项目
2019-04-02 12:23:26 +08:00
5eb382361a Update projects.md 2019-04-02 12:22:14 +08:00
090ccc4d7e 移除重复项目 2019-04-02 12:15:06 +08:00
0085fe93f8 add blacklist 2019-04-02 12:14:52 +08:00
348623fca2 Merge pull request #24896 from martin-yin/patch-1
添加vue-color-ui
2019-04-02 12:12:36 +08:00
38ccac2855 Merge branch 'master' into patch-1 2019-04-02 12:12:16 +08:00
a482bdeb31 Update projects.md
移除导致显示格式有问题的部分文字
2019-04-02 12:11:45 +08:00
e88b999489 Merge pull request #24897 from lxlxw/patch-4
Update README.md
2019-04-02 12:11:28 +08:00
59546afda6 Merge pull request #24874 from binarywang/patch-1
add WxJava
2019-04-02 12:09:50 +08:00
6a2a0aea46 Merge branch 'master' into patch-1 2019-04-02 12:09:32 +08:00
0e96da59ac Merge pull request #24886 from simpleapples/master
Add a golang package: cyclone
2019-04-02 12:08:25 +08:00
b9d28e4ce2 Merge branch 'master' into master 2019-04-02 12:08:05 +08:00
88059463d5 Merge pull request #24881 from jaweii/master
Update projects.md
2019-04-02 12:06:42 +08:00
e60958f961 Merge branch 'master' into master 2019-04-02 12:06:19 +08:00
1739da554f Merge pull request #24880 from KirosHan/patch-1
Update projects.md
2019-04-02 12:05:29 +08:00
cb3bcd0871 Merge branch 'master' into patch-1 2019-04-02 12:05:04 +08:00
5e2f50acec Merge pull request #24879 from AJLoveChina/master
bootcdn is using 996.ICU license
2019-04-02 12:04:22 +08:00
f968b6c04a Merge branch 'master' into master 2019-04-02 12:04:06 +08:00
4871da3219 Merge pull request #24894 from djokovicwang/master
Delete vi_VN.md
2019-04-02 12:02:36 +08:00
lx5
3891c07db3 Update README.md 2019-04-02 12:02:18 +08:00
f813878a57 Merge branch 'master' into patch-1 2019-04-02 12:02:02 +08:00
1bda53cd0c Merge pull request #24892 from binarywang/patch-2
update license badget code
2019-04-02 12:01:16 +08:00
b42dad5286 Merge pull request #24890 from uDp30Z4w/patch-1
Update blacklist.md
2019-04-02 11:59:31 +08:00
c784cf83ae Merge pull request #24889 from pphdsny/dev/leetcode-java
awesomelist: 添加leetcode-java
2019-04-02 11:58:53 +08:00
d6f526bff3 Merge branch 'master' into dev/leetcode-java 2019-04-02 11:58:39 +08:00
24ff6c0174 Merge pull request #24888 from yidasanqian/master
Update projects.md
2019-04-02 11:57:58 +08:00
a8db91d8fc Merge pull request #24883 from iamybj/patch-2
Update blacklist.md
2019-04-02 11:56:42 +08:00
f6d99fff53 添加vue-color-ui 2019-04-02 11:51:04 +08:00
9909c4bd4d Delete vi_VN.md
Duplicate file.
2019-04-02 11:42:12 +08:00
420d07d847 update license badget code 2019-04-02 11:38:52 +08:00