319 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zwjamnsss	62a9f7ea8d	feat: merge	2017-07-18 18:56:47 +08:00
zwjamnsss	1764c4a0ea	feat: add style	2017-07-18 18:55:13 +08:00
yhui.yang	612e75575f	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-18 18:26:07 +08:00
yhui.yang	a4fd0e3480	opti: modify layout and header	2017-07-18 18:25:53 +08:00
祝鑫奔	1d7c59d163	fix: add server_dist/ files	2017-07-18 18:10:55 +08:00
祝鑫奔	77206fa13f	fix: add server_dist/ directory	2017-07-18 18:10:22 +08:00
wenbo.dong	d87027382e	fix: 解决merge冲突	2017-07-18 17:47:47 +08:00
wenbo.dong	a25f67168d	feat: 添加项目显示在项目列表中	2017-07-18 17:46:09 +08:00
zwjamnsss	8935cb3bcd	style	2017-07-18 17:32:32 +08:00
suxiaoxin	5211c48d68	feat: user	2017-07-18 17:18:16 +08:00
suxiaoxin	5576cd7284	feat: user module	2017-07-18 17:15:29 +08:00
李放	0051efad64	fix: merge code	2017-07-18 16:46:19 +08:00
李放	8f03f081a0	opti: 优化分页查询逻辑	2017-07-18 16:37:28 +08:00
祝鑫奔	f9663a7427	docs: 合并文档	2017-07-18 16:11:06 +08:00
祝鑫奔	c4b8461f4d	docs: 更新文档	2017-07-18 16:07:45 +08:00
suxiaoxin	6a889422ee	fix: merge to local	2017-07-18 15:50:07 +08:00
suxiaoxin	903ddc46b9	fix: fix some bug	2017-07-18 15:48:05 +08:00
祝鑫奔	790c530c71	chore: remove files in server_dist/	2017-07-18 15:47:06 +08:00
祝鑫奔	c1cf42dd4f	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-18 15:41:38 +08:00
祝鑫奔	64da2baf29	fix: 解决merge留下的问题	2017-07-18 15:41:18 +08:00
suxiaoxin	c88944e511	feat: merge to local	2017-07-18 15:40:16 +08:00
suxiaoxin	f8fe5026bf	feat: merge to local	2017-07-18 15:39:50 +08:00
祝鑫奔	da7869b476	chore: .gitignore中增加 server_dist/ 排除编译产物	2017-07-18 15:39:10 +08:00
suxiaoxin	73bf7b3d17	feat: merge to local	2017-07-18 15:38:26 +08:00
祝鑫奔	6a42be30ea	fix: 修复用户搜索返回值字段问题	2017-07-18 15:37:21 +08:00
suxiaoxin	66f2eb6390	feat: uesr management module and fix some server bug	2017-07-18 15:35:32 +08:00
祝鑫奔	1d04ec2d28	fix: 修复用户搜索返回密码和盐及过滤项目搜索字段	2017-07-18 15:31:41 +08:00
李放	b2f6ecacf8	docs: list接口返回示例	2017-07-18 15:22:50 +08:00
李放	2ce79aeada	feat: 给list接口添加分页功能	2017-07-18 15:13:47 +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	abb8e03966	feat: add group	2017-07-18 15:06:12 +08:00
wenbo.dong	fba8c0eef2	feat: 新建项目传入当前分组id	2017-07-18 14:58:57 +08:00
wenbo.dong	9205e40660	feat: 添加项目线上域名选项添加option选项	2017-07-18 14:30:33 +08:00
waliang.wang	26daae1ded	feat: 优化合并代码	2017-07-18 12:53:53 +08:00
waliang.wang	35956ad486	合并冲突	2017-07-18 12:00:36 +08:00
waliang.wang	708e75a3b2	解决冲突	2017-07-18 11:57:42 +08:00
wenbo.dong	9395b19480	fix: 修改登录errcode判断错误的bug	2017-07-18 11:38:47 +08:00
wenbo.dong	3eb65389e8	feat: 添加项目逻辑	2017-07-18 10:59:08 +08:00
wenbo.dong	1337ca675f	feat: 添加项目逻辑	2017-07-18 10:56:03 +08:00
qitmac000249	76252d91f3	feat: 增加消息也获取更多方法	2017-07-18 10:17:07 +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	4a05eaf2b1	opti: modify style of header and home	2017-07-17 21:11:58 +08:00
zwjamnsss	98ba76b7f5	initsate	2017-07-17 19:27:20 +08:00
qitmac000249	cbf050fb08	feat: 增加时间轴样式	2017-07-17 18:15:55 +08:00
suxiaoxin	5f7b66ebfa	feat: merge	2017-07-17 16:24:47 +08:00
suxiaoxin	68d0c65a55	feat: modify db config	2017-07-17 16:24:00 +08:00
zwjamnsss	7052874bde	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-17 16:05:26 +08:00
suxiaoxin	7771fbd9ab	feat: merge	2017-07-17 15:51:39 +08:00
suxiaoxin	de689bc921	feat: modify db config_dev	2017-07-17 15:51:15 +08:00
qitmac000249	aa760275da	refactor: 修改container的index.js	2017-07-17 15:32:10 +08:00