Commit Graph

426 Commits

Author SHA1 Message Date
suxiaoxin
f11378a82e merge dev to local 2017-07-13 16:14:26 +08:00
suxiaoxin
19466c6d6c fix: login username bug 2017-07-13 16:13:47 +08:00
yhui.yang
3de51a6032 feat:add Loading 2017-07-13 15:55:46 +08:00
yhui.yang
c2472e45de Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-13 15:53:40 +08:00
yhui.yang
cad5d750e4 feat:add Loading 2017-07-13 15:53:25 +08:00
zwjamnsss
7715b0f4c6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-13 15:10:23 +08:00
zwjamnsss
d086927a51 font-family 2017-07-13 15:10:13 +08:00
suxiaoxin
cb0d9cca67 rm chrome_tools 2017-07-13 11:17:52 +08:00
zwjamnsss
55690f1bbb default eslint 2017-07-13 10:13:37 +08:00
qitmac000068
0fcad29701 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 21:13:41 +08:00
qitmac000068
a64ea192a3 fix:修改了header和登录框的逻辑 2017-07-12 21:13:22 +08:00
suxiaoxin
6a6b5973bc merge dev to local 2017-07-12 20:47:33 +08:00
suxiaoxin
496577a611 add chrome_ext 2017-07-12 20:47:20 +08:00
zwjamnsss
ffae5939e8 remove 2017-07-12 17:17:52 +08:00
zwjamnsss
54e3493c2f none 2017-07-12 17:17:15 +08:00
wenbo.dong
c6c2353474 e branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 17:03:18 +08:00
wenbo.dong
ac9296c4b4 add: 修改文件大小写 2017-07-12 17:03:15 +08:00
suxiaoxin
146d69f3bb merge dev to local dev 2017-07-12 17:01:56 +08:00
suxiaoxin
80b1095852 add third qunar sso login 2017-07-12 17:01:27 +08:00
zwjamnsss
da257fa1d9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:56:26 +08:00
zwjamnsss
20bdd1ce96 remove eslint.json 2017-07-12 16:56:22 +08:00
wenbo.dong
72df36d58b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:39:42 +08:00
zwjamnsss
7da9a89af2 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:38:50 +08:00
zwjamnsss
7e80d4cc7d example 2017-07-12 16:38:42 +08:00
wenbo.dong
3c4fd0af15 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:38:15 +08:00
wenbo.dong
c0e5d95ac1 add: 登录与注册逻辑 2017-07-12 16:38:10 +08:00
qitmac000068
2e720cb01d modify header 2017-07-12 16:27:06 +08:00
wenbo.dong
196fbf7c98 add: 登录/注册逻辑 2017-07-12 16:26:35 +08:00
zwjamnsss
c2b317442c addGroup 2017-07-12 15:41:11 +08:00
zwjamnsss
61b493a820 sonar 2017-07-12 14:18:17 +08:00
zwjamnsss
8a29916edb name 2017-07-12 14:06:29 +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
38795ee1bd import eslint 2017-07-12 14:04:06 +08:00
suxiaoxin
e16d5a4dc9 add some example code 2017-07-12 12:23:40 +08:00
suxiaoxin
01d6319560 merge the latest dev to local 2017-07-12 12:22:39 +08:00
suxiaoxin
52a9301087 yapi add help info 2017-07-12 12:22:10 +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
81bbbc22e6 修改按钮颜色状态 2017-07-12 12:17:43 +08:00
王亮wa
83172dd3f7 Merge branch 'wangliang' into 'dev'
Wangliang

See merge request !8
2017-07-12 12:16:37 +08:00
zwjamnsss
492be1bddc Merge branch 'zwj-yapi' into dev 2017-07-12 12:05:43 +08:00
zwjamnsss
1328738e58 add axios 2017-07-12 12:00:49 +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
9b1c7b55f1 整理多余接口文件 2017-07-12 11:48:16 +08:00
zwjamnsss
403d6eb552 none 2017-07-12 11:43:10 +08:00
zwjamnsss
c774df54d2 none 2017-07-12 11:43:04 +08:00
zwjamnsss
c1b3107e65 Merge branch 'dev' into zwj-yapi 2017-07-12 11:39:36 +08:00
zwjamnsss
3cf7190745 添加中间件 2017-07-12 11:39:06 +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