501 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
祝鑫奔	7af682c88a	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-18 15:41:38 +08:00
祝鑫奔	52f97df53f	fix: 解决merge留下的问题	2017-07-18 15:41:18 +08:00
sean	d2d84857ab	feat: merge to local	2017-07-18 15:40:16 +08:00
sean	20a9374ee8	feat: merge to local	2017-07-18 15:39:50 +08:00
祝鑫奔	6dd0a1069b	chore: .gitignore中增加 server_dist/ 排除编译产物	2017-07-18 15:39:10 +08:00
sean	094d17a196	feat: merge to local	2017-07-18 15:38:26 +08:00
祝鑫奔	0eba4c2854	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
祝鑫奔	165101c4ec	fix: 修复用户搜索返回密码和盐及过滤项目搜索字段	2017-07-18 15:31:41 +08:00
李放	2467556d35	docs: list接口返回示例	2017-07-18 15:22:50 +08:00
李放	461f82c7df	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	3d64753fd4	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	6752f812ba	feat: 添加项目线上域名选项添加option选项	2017-07-18 14:30:33 +08:00
waliang.wang	735ff13df9	feat: 优化合并代码	2017-07-18 12:53:53 +08:00
waliang.wang	6fe68c00ac	合并冲突	2017-07-18 12:00:36 +08:00
waliang.wang	902a9c6810	解决冲突	2017-07-18 11:57:42 +08:00
wenbo.dong	198303e5bc	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	b96a2a3de9	feat: 添加项目逻辑	2017-07-18 10:56:03 +08:00
qitmac000249	a33dfe6503	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	087cd39469	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
qitmac000249	29783a98f7	feat: 增加时间轴样式	2017-07-17 18:15:55 +08:00
sean	9cd843d3a6	feat: merge	2017-07-17 16:24:47 +08:00
sean	ef1a26c222	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
sean	553d3faca0	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
qitmac000249	13df766546	refactor: 修改container的index.js	2017-07-17 15:32:10 +08:00
sean	64baf1486f	feat: merge to local	2017-07-17 13:49:25 +08:00
sean	00e4f3e23e	chore: modify dev config	2017-07-17 13:47:46 +08:00
qitmac000249	615ff8a022	feat: 添加路由以及actionType	2017-07-17 12:24:06 +08:00
qitmac000249	57ff141f29	feat: 增加消息页面	2017-07-17 12:15:21 +08:00
sean	825a3033be	feat: merge to local	2017-07-17 11:01:50 +08:00
sean	8be7c6e8a3	feat: user module client	2017-07-17 11:01:05 +08:00
zwjamnsss	382a6729eb	opti eslint	2017-07-17 10:34:47 +08:00
zwjamnsss	3c6330b04e	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-17 10:18:26 +08:00
zwjamnsss	22159a5b64	feat group	2017-07-17 10:17:37 +08:00
sean	2d3412b924	feat: merge to local	2017-07-14 19:47:38 +08:00
sean	dab9394974	feat: add user module	2017-07-14 19:47:12 +08:00
yhui.yang	7183e5f740	feat: 添加首页，将登录注册移至首页	2017-07-14 19:20:52 +08:00
李放	1a3a808ccd	fix: 误修改servername	2017-07-14 18:09:22 +08:00
李放	ac8ac3d059	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-07-14 18:08:10 +08:00
李放	d222205d20	docs: 增加修改密码和获取项目成员列表返回示例	2017-07-14 18:08:05 +08:00
wenbo.dong	2183e825d5	feat: 创建项目请求	2017-07-14 18:02:01 +08:00
李放	e896cc5d69	#fix: Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev ... # Conflicts: # server/controllers/project.js # server/router.js # server_dist/controllers/project.js # server_dist/router.js	2017-07-14 17:42:03 +08:00
李放	0126784857	add: 修改密码功能和获取项目成员列表功能	2017-07-14 17:37:26 +08:00