Commit Graph

187 Commits

Author SHA1 Message Date
waliang.wang
dc8420805a 添加 删除 接口 2017-07-19 15:12:10 +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
suxiaoxin
c3c232694f feat: merge to local 2017-07-17 13:49:25 +08:00
suxiaoxin
cad35e4527 chore: modify dev config 2017-07-17 13:47:46 +08:00
qitmac000249
86330a75c6 feat: 添加路由以及actionType 2017-07-17 12:24:06 +08:00
qitmac000249
627bc885d0 feat: 增加消息页面 2017-07-17 12:15:21 +08:00
suxiaoxin
a525c435d4 feat: merge to local 2017-07-17 11:01:50 +08:00
suxiaoxin
c93447256b feat: user module client 2017-07-17 11:01:05 +08:00
zwjamnsss
f15b9bd960 opti eslint 2017-07-17 10:34:47 +08:00
zwjamnsss
a19f37bdbe Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-17 10:18:26 +08:00
zwjamnsss
246a651c87 feat group 2017-07-17 10:17:37 +08:00
suxiaoxin
3e2e489e66 feat: merge to local 2017-07-14 19:47:38 +08:00
suxiaoxin
d047389d97 feat: add user module 2017-07-14 19:47:12 +08:00
yhui.yang
5ec15e8663 feat: 添加首页,将登录注册移至首页 2017-07-14 19:20:52 +08:00
李放
9d9e9dec09 fix: 误修改servername 2017-07-14 18:09:22 +08:00
李放
c9f11e7932 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-14 18:08:10 +08:00
李放
cc2be4bdd3 docs: 增加修改密码和获取项目成员列表返回示例 2017-07-14 18:08:05 +08:00
wenbo.dong
dba1d60d26 feat: 创建项目请求 2017-07-14 18:02:01 +08:00
李放
5a074533ae #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
李放
921a140a76 add: 修改密码功能和获取项目成员列表功能 2017-07-14 17:37:26 +08:00
祝鑫奔
53482b7d11 docs: 增加搜索文档返回示例 2017-07-14 17:00:43 +08:00
祝鑫奔
51de666414 docs: 增加搜索文档返回示例 2017-07-14 17:00:30 +08:00
wenbo.dong
4334a1b0d1 feat: 新建项目功能 2017-07-14 16:54:20 +08:00
祝鑫奔
86142d9848 feat: 增加用户名/email/组/项目模糊搜索 2017-07-14 16:41:14 +08:00
zwjamnsss
5df25fbcfa opti remove actionType.js 2017-07-14 15:50:00 +08:00
suxiaoxin
1135a4ab81 chore: 修改默认的80端口 2017-07-14 15:30:22 +08:00
suxiaoxin
74eaf2c308 fix: js path 2017-07-14 15:16:27 +08:00
suxiaoxin
6c93c08ee6 fix: js path 2017-07-14 15:16:15 +08:00
zwjamnsss
e321e45952 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-14 15:16:04 +08:00
zwjamnsss
93acde85b0 feat group api 2017-07-14 15:15:59 +08:00
suxiaoxin
06352a936c chore: del repeat commit message config 2017-07-14 15:14:04 +08:00
suxiaoxin
88a88c6a6f feat: merge dev to local 2017-07-14 15:06:06 +08:00
suxiaoxin
18132f64e4 refactor: 修改dev配置和index首页 2017-07-14 15:04:24 +08:00
waliang.wang
0127e9e5b6 修改首页路由 2017-07-14 14:44:32 +08:00