Commit Graph

4287 Commits

Author SHA1 Message Date
zwjamnsss
546a172aff Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 14:04:19 +08:00
zwjamnsss
0c93495fa3 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 14:04:19 +08:00
zwjamnsss
5718822f1b import eslint 2017-07-12 14:04:06 +08:00
zwjamnsss
38795ee1bd import eslint 2017-07-12 14:04:06 +08:00
sean
d76e5ddb60 add some example code 2017-07-12 12:23:40 +08:00
suxiaoxin
e16d5a4dc9 add some example code 2017-07-12 12:23:40 +08:00
sean
6a134d9a3e merge the latest dev to local 2017-07-12 12:22:39 +08:00
suxiaoxin
01d6319560 merge the latest dev to local 2017-07-12 12:22:39 +08:00
sean
6240eac465 yapi add help info 2017-07-12 12:22:10 +08:00
suxiaoxin
52a9301087 yapi add help info 2017-07-12 12:22:10 +08:00
王亮wa
db80c4af85 Merge branch 'wangliang' into 'dev'
修改文件名称

See merge request !9
2017-07-12 12:18:21 +08:00
waliang.wang
642e2272a1 文件名称 2017-07-12 12:20:01 +08:00
王亮wa
66a5430324 Merge branch 'wangliang' into 'dev'
修改文件名称

See merge request !9
2017-07-12 12:18:21 +08:00
waliang.wang
53cfb4d606 文件名称 2017-07-12 12:20:01 +08:00
waliang.wang
2efd747caa 修改按钮颜色状态 2017-07-12 12:17:43 +08:00
waliang.wang
81bbbc22e6 修改按钮颜色状态 2017-07-12 12:17:43 +08:00
王亮wa
9e42140e05 Merge branch 'wangliang' into 'dev'
Wangliang

See merge request !8
2017-07-12 12:16:37 +08:00
王亮wa
83172dd3f7 Merge branch 'wangliang' into 'dev'
Wangliang

See merge request !8
2017-07-12 12:16:37 +08:00
zwjamnsss
d9d417e818 Merge branch 'zwj-yapi' into dev 2017-07-12 12:05:43 +08:00
zwjamnsss
492be1bddc Merge branch 'zwj-yapi' into dev 2017-07-12 12:05:43 +08:00
zwjamnsss
0dac7875c6 add axios 2017-07-12 12:00:49 +08:00
zwjamnsss
1328738e58 add axios 2017-07-12 12:00:49 +08:00
王亮wa
713342a6c8 Merge branch 'wangliang' into 'dev'
整理reduce

See merge request !7
2017-07-12 11:56:28 +08:00
waliang.wang
c95610a86e 优化reduce 2017-07-12 11:57:28 +08:00
王亮wa
e163a02d13 Merge branch 'wangliang' into 'dev'
整理reduce

See merge request !7
2017-07-12 11:56:28 +08:00
waliang.wang
a145248559 优化reduce 2017-07-12 11:57:28 +08:00
waliang.wang
b97727e1d2 整理多余接口文件 2017-07-12 11:48:16 +08:00
waliang.wang
9b1c7b55f1 整理多余接口文件 2017-07-12 11:48:16 +08:00
zwjamnsss
b0377ea353 none 2017-07-12 11:43:10 +08:00
zwjamnsss
403d6eb552 none 2017-07-12 11:43:10 +08:00
zwjamnsss
04f5ba3e14 none 2017-07-12 11:43:04 +08:00
zwjamnsss
c774df54d2 none 2017-07-12 11:43:04 +08:00
zwjamnsss
61ec6fb541 Merge branch 'dev' into zwj-yapi 2017-07-12 11:39:36 +08:00
zwjamnsss
c1b3107e65 Merge branch 'dev' into zwj-yapi 2017-07-12 11:39:36 +08:00
zwjamnsss
7d25d0ce82 添加中间件 2017-07-12 11:39:06 +08:00
zwjamnsss
3cf7190745 添加中间件 2017-07-12 11:39:06 +08:00
wenbo.dong
9b6ac607f3 t puMerge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 10:17:59 +08:00
wenbo.dong
480ffc8da8 t puMerge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 10:17:59 +08:00
wenbo.dong
6767adcb13 add: 项目页布局 2017-07-12 10:17:57 +08:00
wenbo.dong
0e06915cbd add: 项目页布局 2017-07-12 10:17:57 +08:00
王亮wa
ef29a9763d Merge branch 'wangliang' into 'dev'
添加接口静态页面

See merge request !6
2017-07-11 19:12:34 +08:00
waliang.wang
2eeac22a48 添加接口静态页面 2017-07-11 19:13:12 +08:00
王亮wa
f247d4f378 Merge branch 'wangliang' into 'dev'
添加接口静态页面

See merge request !6
2017-07-11 19:12:34 +08:00
waliang.wang
13e566d99d 添加接口静态页面 2017-07-11 19:13:12 +08:00
sean
daefcada6f add user and interface document 2017-07-11 18:22:20 +08:00
suxiaoxin
c70041271e add user and interface document 2017-07-11 18:22:20 +08:00
苏文雄
70f5034dc4 Merge branch 'dev' into 'master'
Dev merge to master

See merge request !5
2017-07-11 16:55:23 +08:00
suxiaoxin
2d43a10e42 Merge branch 'dev' into 'master'
Dev merge to master

See merge request !5
2017-07-11 16:55:23 +08:00
sean
8f9dfa7e4c add sendMail and install 2017-07-11 16:53:14 +08:00
suxiaoxin
b5e3eff4c7 add sendMail and install 2017-07-11 16:53:14 +08:00