Commit Graph

539 Commits

Author SHA1 Message Date
sean
d8208fbb5c fix: fix userModel uids bug 2017-07-24 16:01:53 +08:00
李放
3d46e72106 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 12:26:01 +08:00
李放
2ecbc84610 docs: log的save功能注释 2017-07-24 12:25:46 +08:00
yhui.yang
97a67b9b39 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 11:35:39 +08:00
yhui.yang
1cb95f6ee4 fix: 修复未登录时的路由地址未改变 2017-07-24 11:35:31 +08:00
sean
4d05e2f562 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 11:24:13 +08:00
sean
e0fdafe3fc feat: 完善path验证规则 2017-07-24 11:24:08 +08:00
waliang.wang
811c71ee5f 合并代码,解决冲突 2017-07-24 11:14:30 +08:00
waliang.wang
9d9b7cd444 put 接口 2017-07-24 11:10:23 +08:00
yhui.yang
79a91f4f71 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 11:04:56 +08:00
yhui.yang
a7189e194e fix: rename App->Application 2017-07-24 11:04:51 +08:00
waliang.wang
a6b29de66f feat - 编辑接口 2017-07-24 10:59:17 +08:00
wenbo.dong
61a62017dd feat: 登录模块添加状态提示 2017-07-23 18:24:46 +08:00
wenbo.dong
05b32b02d9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-23 17:32:28 +08:00
wenbo.dong
1517e7ddd1 fix: 修复修改项目表单显示异常的bug 2017-07-23 17:31:14 +08:00
yhui.yang
08bccf4451 fix: merge 2017-07-21 12:29:53 +08:00
yhui.yang
16b212df46 fix: 修改action,去掉登录退出的强制刷新 2017-07-21 12:27:24 +08:00
sean
4592c344a2 feat: doc and fix some bug 2017-07-21 11:46:44 +08:00
sean
44fe3f0b09 fix: import app to App 2017-07-21 10:12:49 +08:00
苏文雄
be8967bccb 删除app.js 2017-07-21 10:04:03 +08:00
sean
6d4948503e fix: fix project interface bug and change app.js to App.js 2017-07-21 10:03:34 +08:00
wenbo.dong
2f8a53d139 opti: 样式微调 2017-07-20 22:24:31 +08:00
wenbo.dong
3014ea607b feat: 修改项目的环境配置功能 2017-07-20 22:08:09 +08:00
wenbo.dong
bcd9f61d04 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 21:37:00 +08:00
yhui.yang
bf0a04e2a9 opti: add skip of menu 2017-07-20 21:30:35 +08:00
yhui.yang
c59421ffce fix: 为了刷新app.js的路由,在登录退出时加上强制刷新 2017-07-20 20:52:04 +08:00
yhui.yang
2761de1ad6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:31:37 +08:00
yhui.yang
bb5c140e17 feat: 添加header上的搜索,修改路由,修改登录页面样式,merge文件 2017-07-20 20:31:20 +08:00
李放
95a485f7be Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:30:28 +08:00
李放
a8774cb5ca opti: 去除log多余接口 2017-07-20 20:30:24 +08:00
wenbo.dong
df084b3eb7 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:24:09 +08:00
wenbo.dong
d7a9473fbd fix: 处理冲突文件 2017-07-20 20:24:06 +08:00
yhui.yang
5c9914f367 feat: 添加header上的搜索,修改路由,修改登录页面样式 2017-07-20 19:59:49 +08:00
sean
9d1a4fc83e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 19:47:16 +08:00
sean
d6fb9e160e fix: fix interface up bug 2017-07-20 19:47:10 +08:00
waliang.wang
50fbe6396c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev2 2017-07-20 19:26:14 +08:00
waliang.wang
8fde9d38b4 feat : 调试保存接口 2017-07-20 19:26:04 +08:00
李放
347fde14bc Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 19:22:03 +08:00
李放
2fd9ab85a4 feat: 添加node的model及基本增删查改功能接口 2017-07-20 19:21:46 +08:00
sean
a1bb3932fd fix: group_id to project_id in the interface model 2017-07-20 18:37:00 +08:00
sean
d2af9afb25 feat: change some user style 2017-07-20 18:15:45 +08:00
wenbo.dong
2e54c48d5d Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 17:57:43 +08:00
wenbo.dong
c2e377aade fix: 修改project/add&up接口参数 2017-07-20 17:53:28 +08:00
waliang.wang
c8f60498cf 文件大小写 2017-07-20 17:20:30 +08:00
wenbo.dong
566865f95a feat: 项目列表显示创建人 2017-07-20 17:08:29 +08:00
waliang.wang
578750f957 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:57:25 +08:00
waliang.wang
8b3b4db34e git 忽略大小写 文件夹修改 2017-07-20 16:57:21 +08:00
sean
6cf33797b1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:56:48 +08:00
zwjamnsss
6645af2cfb fix: 文件路径 2017-07-20 16:53:47 +08:00
sean
70a9660db3 feat: user style 2017-07-20 16:44:41 +08:00