Commit Graph

1460 Commits

Author SHA1 Message Date
ddbe1e5dec Merge pull request #24853 from jinlong-hao/master
996协议工程列表添加 eppdev-jee
2019-04-01 23:07:55 +08:00
2139503343 Merge pull request #24854 from maguowei/clean
去掉不合适保留的描述文字
2019-04-01 23:07:25 +08:00
b720246082 Merge pull request #24850 from djokovicwang/master
Set the most famous companies to the top
2019-04-01 23:06:34 +08:00
20683bf045 Merge branch 'master' into master 2019-04-01 23:06:08 +08:00
601dc54dba Merge pull request #24849 from enyucao/master
Add Svenska 瑞典语 to translation list
2019-04-01 23:04:09 +08:00
f2b4200298 Merge pull request #24844 from l-hammer/dev
[Chore]update awesomelist
2019-04-01 23:03:33 +08:00
6f787c5d02 Update LICENSE_CN 2019-04-01 22:57:30 +08:00
bcf6c2bfb8 Merge pull request #3 from 996icu/master
update
2019-04-01 22:56:29 +08:00
287fe14e06 Update projects.md 2019-04-01 22:36:24 +08:00
beb44a70db Update projects.md 2019-04-01 22:35:40 +08:00
8effebfee4 Update projects.md 2019-04-01 22:34:53 +08:00
fa67c744d7 update projects.md 2019-04-01 22:05:51 +08:00
bddcd5b7a6 去掉不合适保留的描述文字 2019-04-01 21:38:20 +08:00
717e930c48 添加 eppdev-jee 2019-04-01 21:23:48 +08:00
123c592486 Update README.md 2019-04-01 21:15:33 +08:00
fc2c297628 Merge pull request #1 from 996icu/master
Update
2019-04-01 21:02:51 +08:00
bac20dc089 Unified logo size 2019-04-01 20:47:53 +08:00
7facac72eb Merge remote-tracking branch 'upstream/master'
* upstream/master:
  dura项目补充
  新增支持项目
  Update blacklist.md
  Update README.md
2019-04-01 20:42:49 +08:00
2cd2babe50 Set the most famous companies to the top 2019-04-01 20:37:04 +08:00
61bd6b7a2c Add Svenska 瑞典语 to translation list 2019-04-01 14:06:11 +02:00
c4a58ef02a Update projects.md 2019-04-01 20:00:12 +08:00
f060cd405d Update projects.md 2019-04-01 19:58:42 +08:00
04e392bddb Merge pull request #24847 from CN-YUANYU/dura
dura项目补充
2019-04-01 19:44:03 +08:00
c3e3674822 dura项目补充 2019-04-01 19:41:28 +08:00
276b95246f Merge pull request #24845 from bofeiw/blacklist
[fix] blacklist.md 城市名称跨行显示
2019-04-01 19:41:12 +08:00
37563750a2 Merge pull request #24846 from cookieY/master
新增支持开源项目
2019-04-01 19:40:27 +08:00
6f5e78ef60 Merge pull request #24843 from bofeiw/readme
Update README.md
2019-04-01 19:39:00 +08:00
fca5bc435e 新增支持项目
新增支持项目Yearning 声援996.icu
2019-04-01 19:31:31 +08:00
42b9c4f187 Update blacklist.md 2019-04-01 22:09:06 +11:00
5c73201705 [Chore]update awesomelist 2019-04-01 19:01:20 +08:00
f25ff4fb04 Update README.md 2019-04-01 21:51:32 +11:00
78801289e2 Merge pull request #24839 from qmdx/master
add mybatis.plus
2019-04-01 18:32:27 +08:00
89a0a59a9b Merge branch 'master' into master 2019-04-01 18:32:16 +08:00
31740e77b3 Merge pull request #24838 from infinnie/patch-1
Update projects.md
2019-04-01 18:30:50 +08:00
41054643c1 Merge pull request #24836 from wildfirechat/master
野火IM解决方案支持996ICU License
2019-04-01 18:30:32 +08:00
56f0ccd085 Merge branch 'master' into master 2019-04-01 18:30:16 +08:00
a24ba74f1b Merge pull request #24835 from NingZelin/master
Update projects.md
2019-04-01 18:29:38 +08:00
78cb3bfe10 Merge branch 'master' into master 2019-04-01 18:29:23 +08:00
270d5bd5fa Update README.md 2019-04-01 18:28:11 +08:00
a2dd40d3eb Merge pull request #24834 from kattgu7/master
Add the New Chinese License and few other name change
2019-04-01 18:23:11 +08:00
12905d1e5b Update projects.md 2019-04-01 18:18:11 +08:00
38befd7b50 Update projects.md 2019-04-01 18:17:14 +08:00
382ed86593 Update projects.md 2019-04-01 18:15:17 +08:00
7fc3eba504 Update projects.md
此项目已增加 996 License
2019-04-01 18:05:23 +08:00
6fd0a70cf0 野火IM解决方案支持996ICU License 2019-04-01 18:03:27 +08:00
e70edd7351 delete 'draft', now 1.0 is ready 2019-04-01 17:59:08 +08:00
e3e6cebfa2 Merge branch 'master' into master 2019-04-01 17:52:49 +08:00
aae76ff182 Merge pull request #24830 from kakalote2008/master
add 蚂蚁金服
2019-04-01 17:45:51 +08:00
4d70534af2 Solve conflict 2019-04-01 17:45:40 +08:00
32283f181a Merge pull request #24832 from Leslin/master
Update projects.md
2019-04-01 17:45:09 +08:00