Commit Graph

475 Commits

Author SHA1 Message Date
zwjamnsss
74e3e68ad4 refactor: 修改添加分组Modal样式 2017-07-19 10:39:59 +08:00
yhui.yang
18b1f752e2 feat: add logout 2017-07-19 10:38:29 +08:00
wenbo.dong
84ad54a2df feat: 删除项目功能 2017-07-18 22:08:01 +08:00
wenbo.dong
357b8648f5 fix: 获取项目列表字段调整 2017-07-18 21:11:32 +08:00
sean
f771006ea0 fix: fix ignore bug 2017-07-18 19:50:43 +08:00
sean
7ce6def425 feat: user client module 2017-07-18 19:47:38 +08:00
zwjamnsss
539285877c feat: merge 2017-07-18 18:56:47 +08:00
zwjamnsss
b760261efd feat: add style 2017-07-18 18:55:13 +08:00
yhui.yang
6b0b4e9fb1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-18 18:26:07 +08:00
yhui.yang
f7fc1f617d opti: modify layout and header 2017-07-18 18:25:53 +08:00
祝鑫奔
a57766f203 fix: add server_dist/ files 2017-07-18 18:10:55 +08:00
祝鑫奔
e0dcad930e fix: add server_dist/ directory 2017-07-18 18:10:22 +08:00
wenbo.dong
7661609a80 fix: 解决merge冲突 2017-07-18 17:47:47 +08:00
wenbo.dong
277580a867 feat: 添加项目显示在项目列表中 2017-07-18 17:46:09 +08:00
zwjamnsss
e28f9c2b41 style 2017-07-18 17:32:32 +08:00
sean
3dd91589d5 feat: user 2017-07-18 17:18:16 +08:00
sean
01d215d7a5 feat: user module 2017-07-18 17:15:29 +08:00
李放
03004ac92a fix: merge code 2017-07-18 16:46:19 +08:00
李放
6e0e7a3ad8 opti: 优化分页查询逻辑 2017-07-18 16:37:28 +08:00
祝鑫奔
29b88210f1 docs: 合并文档 2017-07-18 16:11:06 +08:00
祝鑫奔
887b21b7c8 docs: 更新文档 2017-07-18 16:07:45 +08:00
sean
ed978f2473 fix: merge to local 2017-07-18 15:50:07 +08:00
sean
5d11a7b2d3 fix: fix some bug 2017-07-18 15:48:05 +08:00
祝鑫奔
e356727125 chore: remove files in server_dist/ 2017-07-18 15:47:06 +08:00
祝鑫奔
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