Commit Graph

323 Commits

Author SHA1 Message Date
wenbo.dong
ff1d162d0e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-23 17:32:28 +08:00
wenbo.dong
ff44b9b129 fix: 修复修改项目表单显示异常的bug 2017-07-23 17:31:14 +08:00
yhui.yang
5449517f4c fix: merge 2017-07-21 12:29:53 +08:00
yhui.yang
ab732c5cf6 fix: 修改action,去掉登录退出的强制刷新 2017-07-21 12:27:24 +08:00
suxiaoxin
ca6390f6ca feat: doc and fix some bug 2017-07-21 11:46:44 +08:00
suxiaoxin
c3ad652c84 fix: import app to App 2017-07-21 10:12:49 +08:00
suxiaoxin
77f6943456 删除app.js 2017-07-21 10:04:03 +08:00
suxiaoxin
fbdd7d8bef fix: fix project interface bug and change app.js to App.js 2017-07-21 10:03:34 +08:00
wenbo.dong
f38106e91b opti: 样式微调 2017-07-20 22:24:31 +08:00
wenbo.dong
375769b257 feat: 修改项目的环境配置功能 2017-07-20 22:08:09 +08:00
wenbo.dong
b6524a6ced Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 21:37:00 +08:00
yhui.yang
63f18dad65 opti: add skip of menu 2017-07-20 21:30:35 +08:00
yhui.yang
39e0221587 fix: 为了刷新app.js的路由,在登录退出时加上强制刷新 2017-07-20 20:52:04 +08:00
yhui.yang
1845d2010c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:31:37 +08:00
yhui.yang
e39240fb27 feat: 添加header上的搜索,修改路由,修改登录页面样式,merge文件 2017-07-20 20:31:20 +08:00
李放
285e7eadc8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:30:28 +08:00
李放
6fd6b40a43 opti: 去除log多余接口 2017-07-20 20:30:24 +08:00
wenbo.dong
dc8632c69a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:24:09 +08:00
wenbo.dong
0fcd2486d7 fix: 处理冲突文件 2017-07-20 20:24:06 +08:00
yhui.yang
3e2f7b90f7 feat: 添加header上的搜索,修改路由,修改登录页面样式 2017-07-20 19:59:49 +08:00
suxiaoxin
84e33fe414 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 19:47:16 +08:00
suxiaoxin
22f0f557bd fix: fix interface up bug 2017-07-20 19:47:10 +08:00
李放
6f8fb97ad6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 19:22:03 +08:00
李放
9295f1a0d1 feat: 添加node的model及基本增删查改功能接口 2017-07-20 19:21:46 +08:00
suxiaoxin
983f17bdc5 fix: group_id to project_id in the interface model 2017-07-20 18:37:00 +08:00
suxiaoxin
5e096d1e67 feat: change some user style 2017-07-20 18:15:45 +08:00
wenbo.dong
0a167b24d0 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 17:57:43 +08:00
wenbo.dong
45a3776f28 fix: 修改project/add&up接口参数 2017-07-20 17:53:28 +08:00
wenbo.dong
7d3e86bf97 feat: 项目列表显示创建人 2017-07-20 17:08:29 +08:00
waliang.wang
eadc61abbe Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:57:25 +08:00
waliang.wang
fa6cd2ab22 git 忽略大小写 文件夹修改 2017-07-20 16:57:21 +08:00
suxiaoxin
f148273f3a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:56:48 +08:00
zwjamnsss
ab610cf3b5 fix: 文件路径 2017-07-20 16:53:47 +08:00
suxiaoxin
d80dfea9aa feat: user style 2017-07-20 16:44:41 +08:00
waliang.wang
689e4d2081 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:38:56 +08:00
waliang.wang
76c436a3ac feat - 接口页面布局 2017-07-20 16:38:50 +08:00
waliang.wang
669aca8320 合并代码 解决冲突 2017-07-20 16:35:33 +08:00
waliang.wang
918d895ff3 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:34:51 +08:00
waliang.wang
ee3322fa4e feat - 添加接口详情 测试 mock 2017-07-20 16:34:46 +08:00
qitmac000249
692a84a880 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-07-20 16:31:03 +08:00
qitmac000249
d6f0c102ae fix: 消息页修改为日志也 2017-07-20 16:30:55 +08:00
zwjamnsss
21cd3cdbce Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 16:27:16 +08:00
zwjamnsss
52542b30d6 fix: sourceMap修复 2017-07-20 16:27:10 +08:00
suxiaoxin
573fc89b69 feat: interface add title field 2017-07-20 16:14:20 +08:00
wenbo.dong
524fd9faa1 feat: 项目列表跳转到接口页 2017-07-20 16:03:36 +08:00
wenbo.dong
1e279c2eef feat: QSSO登录 2017-07-20 15:49:36 +08:00
waliang.wang
4544ecb23b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 15:38:30 +08:00
waliang.wang
a9521b7606 feat - 接口列表数据 2017-07-20 15:38:25 +08:00
wenbo.dong
e638f71bea Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 15:31:45 +08:00
suxiaoxin
b4d3b9d699 feat: merge to local 2017-07-20 15:28:21 +08:00