4938 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
suxiaoxin	73bf7b3d17	feat: merge to local	2017-07-18 15:38:26 +08:00
祝鑫奔	0eba4c2854	fix: 修复用户搜索返回值字段问题	2017-07-18 15:37:21 +08:00
祝鑫奔	6a42be30ea	fix: 修复用户搜索返回值字段问题	2017-07-18 15:37:21 +08:00
sean	7749672f26	feat: uesr management module and fix some server bug	2017-07-18 15:35:32 +08:00
suxiaoxin	66f2eb6390	feat: uesr management module and fix some server bug	2017-07-18 15:35:32 +08:00
祝鑫奔	165101c4ec	fix: 修复用户搜索返回密码和盐及过滤项目搜索字段	2017-07-18 15:31:41 +08:00
祝鑫奔	1d04ec2d28	fix: 修复用户搜索返回密码和盐及过滤项目搜索字段	2017-07-18 15:31:41 +08:00
李放	2467556d35	docs: list接口返回示例	2017-07-18 15:22:50 +08:00
李放	b2f6ecacf8	docs: list接口返回示例	2017-07-18 15:22:50 +08:00
李放	461f82c7df	feat: 给list接口添加分页功能	2017-07-18 15:13:47 +08:00
李放	2ce79aeada	feat: 给list接口添加分页功能	2017-07-18 15:13:47 +08:00
zwjamnsss	bcfb052ae4	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-18 15:06:33 +08:00
zwjamnsss	54e84763a5	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-18 15:06:33 +08:00
zwjamnsss	3d64753fd4	feat: add group	2017-07-18 15:06:12 +08:00
zwjamnsss	abb8e03966	feat: add group	2017-07-18 15:06:12 +08:00
wenbo.dong	d84063a5c2	feat: 新建项目传入当前分组id	2017-07-18 14:58:57 +08:00
wenbo.dong	fba8c0eef2	feat: 新建项目传入当前分组id	2017-07-18 14:58:57 +08:00
wenbo.dong	6752f812ba	feat: 添加项目线上域名选项添加option选项	2017-07-18 14:30:33 +08:00
wenbo.dong	9205e40660	feat: 添加项目线上域名选项添加option选项	2017-07-18 14:30:33 +08:00
waliang.wang	735ff13df9	feat: 优化合并代码	2017-07-18 12:53:53 +08:00
waliang.wang	26daae1ded	feat: 优化合并代码	2017-07-18 12:53:53 +08:00
waliang.wang	6fe68c00ac	合并冲突	2017-07-18 12:00:36 +08:00
waliang.wang	35956ad486	合并冲突	2017-07-18 12:00:36 +08:00
waliang.wang	902a9c6810	解决冲突	2017-07-18 11:57:42 +08:00
waliang.wang	708e75a3b2	解决冲突	2017-07-18 11:57:42 +08:00
wenbo.dong	198303e5bc	fix: 修改登录errcode判断错误的bug	2017-07-18 11:38:47 +08:00
wenbo.dong	9395b19480	fix: 修改登录errcode判断错误的bug	2017-07-18 11:38:47 +08:00
wenbo.dong	9a2c44f433	feat: 添加项目逻辑	2017-07-18 10:59:08 +08:00
wenbo.dong	3eb65389e8	feat: 添加项目逻辑	2017-07-18 10:59:08 +08:00
wenbo.dong	b96a2a3de9	feat: 添加项目逻辑	2017-07-18 10:56:03 +08:00
wenbo.dong	1337ca675f	feat: 添加项目逻辑	2017-07-18 10:56:03 +08:00
qitmac000249	a33dfe6503	feat: 增加消息也获取更多方法	2017-07-18 10:17:07 +08:00
qitmac000249	76252d91f3	feat: 增加消息也获取更多方法	2017-07-18 10:17:07 +08:00
yhui.yang	9261cff925	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-17 21:12:06 +08:00
yhui.yang	0665bdadfb	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-17 21:12:06 +08:00
yhui.yang	087cd39469	opti: modify style of header and home	2017-07-17 21:11:58 +08:00
yhui.yang	4a05eaf2b1	opti: modify style of header and home	2017-07-17 21:11:58 +08:00
zwjamnsss	ecaba6585f	initsate	2017-07-17 19:27:20 +08:00
zwjamnsss	98ba76b7f5	initsate	2017-07-17 19:27:20 +08:00
qitmac000249	29783a98f7	feat: 增加时间轴样式	2017-07-17 18:15:55 +08:00
qitmac000249	cbf050fb08	feat: 增加时间轴样式	2017-07-17 18:15:55 +08:00
sean	9cd843d3a6	feat: merge	2017-07-17 16:24:47 +08:00
suxiaoxin	5f7b66ebfa	feat: merge	2017-07-17 16:24:47 +08:00
sean	ef1a26c222	feat: modify db config	2017-07-17 16:24:00 +08:00
suxiaoxin	68d0c65a55	feat: modify db config	2017-07-17 16:24:00 +08:00
zwjamnsss	a1c5f1aa7c	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-17 16:05:26 +08:00
zwjamnsss	7052874bde	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-17 16:05:26 +08:00
sean	553d3faca0	feat: merge	2017-07-17 15:51:39 +08:00
suxiaoxin	7771fbd9ab	feat: merge	2017-07-17 15:51:39 +08:00
sean	2a4867e5c0	feat: modify db config_dev	2017-07-17 15:51:15 +08:00