Commit Graph

909 Commits

Author SHA1 Message Date
sean
997642625c merge dev to local dev 2017-07-12 17:01:56 +08:00
sean
55e519bfe7 add third qunar sso login 2017-07-12 17:01:27 +08:00
zwjamnsss
e26f02fe00 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:56:26 +08:00
zwjamnsss
8de4d05ddc remove eslint.json 2017-07-12 16:56:22 +08:00
wenbo.dong
eda0ed95dc Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:39:42 +08:00
zwjamnsss
90c56403cf Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:38:50 +08:00
zwjamnsss
3ffb7895f8 example 2017-07-12 16:38:42 +08:00
wenbo.dong
42d50e3525 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:38:15 +08:00
wenbo.dong
46d62bc9e1 add: 登录与注册逻辑 2017-07-12 16:38:10 +08:00
qitmac000068
01f2a5122e modify header 2017-07-12 16:27:06 +08:00
wenbo.dong
035db2f357 add: 登录/注册逻辑 2017-07-12 16:26:35 +08:00
zwjamnsss
af5b8c26e8 addGroup 2017-07-12 15:41:11 +08:00
zwjamnsss
b2a990a3b9 sonar 2017-07-12 14:18:17 +08:00
zwjamnsss
8d8b925b63 name 2017-07-12 14:06:29 +08:00
zwjamnsss
546a172aff 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
sean
d76e5ddb60 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
sean
6240eac465 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
waliang.wang
2efd747caa 修改按钮颜色状态 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
zwjamnsss
d9d417e818 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
王亮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
waliang.wang
b97727e1d2 整理多余接口文件 2017-07-12 11:48:16 +08:00
zwjamnsss
b0377ea353 none 2017-07-12 11:43:10 +08:00
zwjamnsss
04f5ba3e14 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
7d25d0ce82 添加中间件 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
6767adcb13 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
sean
daefcada6f 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
sean
8f9dfa7e4c add sendMail and install 2017-07-11 16:53:14 +08:00
sean
24651b423a add sendMail and install website 2017-07-11 16:50:17 +08:00
zwjamnsss
06fb7690e6 redux action 2017-07-11 16:35:48 +08:00
zwjamnsss
73f3d223ad none 2017-07-11 15:03:02 +08:00
zwjamnsss
9d4939643c 添加样式 2017-07-11 14:37:20 +08:00
王亮wa
c4388bcb2f Merge branch 'wangliang' into 'dev'
添加 connect

See merge request !4
2017-07-11 12:46:26 +08:00
waliang.wang
f3e736671a Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into wangliang 2017-07-11 12:41:27 +08:00
waliang.wang
cf488810e7 添加connect 2017-07-11 12:30:26 +08:00
sean
20a8b18bdb add user login and reg 2017-07-11 12:13:38 +08:00
waliang.wang
70c4942678 解决冲突 2017-07-11 12:13:11 +08:00
sean
8311f6021c user login and reg 2017-07-11 12:12:43 +08:00
wenbo.dong
68828ebd3b add: 处理sonar提示的语法错误 2017-07-11 11:03:34 +08:00