Commit Graph

475 Commits

Author SHA1 Message Date
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
祝鑫奔
0236a8fca5 docs: 增加搜索文档返回示例 2017-07-14 17:00:43 +08:00
祝鑫奔
cb8ab8a762 docs: 增加搜索文档返回示例 2017-07-14 17:00:30 +08:00
wenbo.dong
37762a109d feat: 新建项目功能 2017-07-14 16:54:20 +08:00
祝鑫奔
b6656a10d2 feat: 增加用户名/email/组/项目模糊搜索 2017-07-14 16:41:14 +08:00
zwjamnsss
9a0a238f4d opti remove actionType.js 2017-07-14 15:50:00 +08:00
sean
2877abb825 chore: 修改默认的80端口 2017-07-14 15:30:22 +08:00
sean
95a9f1d03f fix: js path 2017-07-14 15:16:27 +08:00
sean
2606f8a86a fix: js path 2017-07-14 15:16:15 +08:00
zwjamnsss
1084679611 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-14 15:16:04 +08:00
zwjamnsss
0a7568dcbc feat group api 2017-07-14 15:15:59 +08:00
sean
aea3097ab3 chore: del repeat commit message config 2017-07-14 15:14:04 +08:00
sean
a1cc5ad7b1 feat: merge dev to local 2017-07-14 15:06:06 +08:00
sean
672187c794 refactor: 修改dev配置和index首页 2017-07-14 15:04:24 +08:00
waliang.wang
a090ebf19f 修改首页路由 2017-07-14 14:44:32 +08:00
waliang.wang
945c70901e 文件夹命名 2017-07-14 12:19:10 +08:00
sean
35e80fe3a6 refactor: add commit message 2017-07-14 12:00:55 +08:00
waliang.wang
4480a26112 删除多余action文件 2017-07-14 11:41:14 +08:00
waliang.wang
87b4775fa0 接口展现页面 项目成员管理 2017-07-14 11:27:34 +08:00
zwjamnsss
d3ed52775e proxy 2017-07-14 11:22:08 +08:00
wenbo.dong
1a36d4ef61 docs: 修改登录页注释 2017-07-14 11:07:39 +08:00
苏文雄
328150003e Merge branch 'dev' into 'master'
merge: dev to master

merge: dev to master

See merge request !12
2017-07-13 20:52:43 +08:00
waliang.wang
5951e55f80 管理项目成员模块 2017-07-13 20:09:04 +08:00
wenbo.dong
c8e98c7a9a feat: 登录时记住密码 2017-07-13 16:58:39 +08:00
wenbo.dong
739a2fb11f feat: 记住密码到cookie中 2017-07-13 16:48:20 +08:00
qitmac000249
8e9f571130 Feat 增加footer组件 2017-07-13 16:39:14 +08:00
sean
40d3448b51 merge dev to local 2017-07-13 16:14:26 +08:00