Commit Graph

2005 Commits

Author SHA1 Message Date
zwjamnsss
94a4408320 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-10-11 11:39:08 +08:00
suxiaoxin
3b0d91e3cd Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-10-11 11:37:46 +08:00
zwjamnsss
c36f23eb9e fix: 解决冲突 2017-10-11 11:36:52 +08:00
suxiaoxin
ba6e1f016f docs: add devops docs 2017-10-11 11:29:02 +08:00
suxiaoxin
7aed033916 docs: add nginx and https info 2017-10-11 11:27:03 +08:00
suxiaoxin
8b3d10e201 fix: update member info bug 2017-10-11 11:19:04 +08:00
喻希里
afd9129ca3 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-10-11 11:04:27 +08:00
zwjamnsss
1ad6ad990d fix: 个人中心添加hover视觉反馈 2017-10-11 11:04:21 +08:00
喻希里
f3eb644f67 fix: user页去除subnav 2017-10-11 11:03:53 +08:00
suxiaoxin
e670b6a392 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-10-11 10:54:39 +08:00
zwjamnsss
535f635560 fix: 改变用户邮箱bug 2017-10-11 10:50:51 +08:00
suxiaoxin
c63bdcc243 fix: npm 依赖 bug 2017-10-10 21:20:13 +08:00
suxiaoxin
11e85640c9 fix: postman basepath bug 2017-10-10 21:13:35 +08:00
suxiaoxin
2b8141a3d1 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-10-10 20:26:25 +08:00
zwjamnsss
16a4fa1bcc Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-10-10 20:02:24 +08:00
zwjamnsss
7a076027ba fix: 修改用户名邮箱bug 2017-10-10 20:02:17 +08:00
wenbo.dong
4c924ff064 fix: 项目环境配置图标对齐错误 2017-10-10 19:03:52 +08:00
wenbo.dong
967d628205 docs: 文档链接都指向yapi.ymfe.org 2017-10-10 18:36:18 +08:00
suxiaoxin
126066a8d8 opti: 完善插件机制,统一基于promise.resolve返回处理结果 2017-10-10 18:03:09 +08:00
suxiaoxin
50c85fccf0 fix: env basepath 被忽略bug 2017-10-10 16:42:07 +08:00
suxiaoxin
1bd163ddb8 opti: opti login png 2017-10-10 11:45:38 +08:00
suxiaoxin
0aa0598926 fix: log group bug 2017-10-10 11:34:33 +08:00
suxiaoxin
845011233f feat: add devops doc 2017-10-10 10:25:50 +08:00
suxiaoxin
588a8f9f7f feat: add v1.1 changeLog 2017-10-10 09:58:12 +08:00
suxiaoxin
375a4d7822 fix: add json-schema-faker 依赖 2017-10-09 18:14:41 +08:00
suxiaoxin
801aba3966 chore: update static file 2017-10-08 17:17:49 +08:00
suxiaoxin
d5f3d371b2 opti: update static 2017-10-08 17:16:35 +08:00
suxiaoxin
b8cfd85929 Merge branch 'master' of gitlab.corp.qunar.com:mfe/yapi 2017-10-08 17:08:21 +08:00
suxiaoxin
a10818762d chore: update static file 2017-10-08 17:06:14 +08:00
suxiaoxin
b59d03777d chore: update static file 2017-10-08 16:59:59 +08:00
Sean
dfa81b5259 Update README.md 2017-10-08 03:46:44 -05:00
suxiaoxin
7ad0134cc3 docs: add mail config 2017-10-08 16:46:04 +08:00
suxiaoxin
ccdc8af4e5 opti: 增加qq群 和 apache2.0协议 2017-10-08 16:20:27 +08:00
suxiaoxin
72e7b97d68 Merge branch 'dev-1.1' 2017-10-07 07:12:31 +08:00
suxiaoxin
7b7ce92ddc opti: delete qsso plugin in the package.json 2017-10-07 07:10:27 +08:00
suxiaoxin
f129e98401 chore: update static file 2017-10-07 07:09:13 +08:00
suxiaoxin
1da2910eec fix: 不存在的用户接口报错 2017-10-07 07:05:54 +08:00
suxiaoxin
045b521106 opti: update crossRequest and support https request 2017-10-07 06:54:59 +08:00
suxiaoxin
50f75db39c fix: package.json bug 2017-10-05 14:17:24 +08:00
suxiaoxin
03acd892df fix: version number 2017-10-05 14:05:32 +08:00
suxiaoxin
1fe3fce6e5 opti: readme 2017-10-05 10:55:27 +08:00
suxiaoxin
fcfa5124d7 Merge branch 'dev' into dev-1.1 2017-10-05 10:51:24 +08:00
suxiaoxin
83fd4259be opti: readme 2017-10-05 10:51:01 +08:00
suxiaoxin
2936cfc1a8 Merge branch 'dev' into dev-1.1 2017-10-05 10:33:54 +08:00
suxiaoxin
ff99ad1acb docs: opti Readme 2017-10-05 10:33:39 +08:00
suxiaoxin
e7b5fb43fd Merge branch 'dev' into 'dev-1.1'
Dev

See merge request !74
2017-10-05 10:09:37 +08:00
suxiaoxin
d076323887 feat: add version num 2017-10-05 10:06:49 +08:00
suxiaoxin
8474100347 opti: del package-lock 2017-10-05 10:04:11 +08:00
suxiaoxin
a31bdce103 chore: update static file 2017-10-05 09:58:59 +08:00
suxiaoxin
972c8ed74f fix: 发送邮件标题文案 2017-10-05 09:57:10 +08:00