Commit Graph

2031 Commits

Author SHA1 Message Date
苏文雄
328150003e Merge branch 'dev' into 'master'
merge: dev to master

merge: dev to master

See merge request !12
2017-07-13 20:52:43 +08:00
waliang.wang
5951e55f80 管理项目成员模块 2017-07-13 20:09:04 +08:00
wenbo.dong
c8e98c7a9a feat: 登录时记住密码 2017-07-13 16:58:39 +08:00
wenbo.dong
739a2fb11f feat: 记住密码到cookie中 2017-07-13 16:48:20 +08:00
qitmac000249
8e9f571130 Feat 增加footer组件 2017-07-13 16:39:14 +08:00
sean
40d3448b51 merge dev to local 2017-07-13 16:14:26 +08:00
sean
2777297027 fix: login username bug 2017-07-13 16:13:47 +08:00
yhui.yang
525c06c2b9 feat:add Loading 2017-07-13 15:55:46 +08:00
yhui.yang
d76ee5fb29 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-13 15:53:40 +08:00
yhui.yang
c8e3cd85ba feat:add Loading 2017-07-13 15:53:25 +08:00
zwjamnsss
c91a5478fa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-13 15:10:23 +08:00
zwjamnsss
a54a8f979d font-family 2017-07-13 15:10:13 +08:00
sean
47b46afade rm chrome_tools 2017-07-13 11:17:52 +08:00
zwjamnsss
c744ebe37d default eslint 2017-07-13 10:13:37 +08:00
qitmac000068
a66d1b4aaf Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 21:13:41 +08:00
qitmac000068
719d6fcb25 fix:修改了header和登录框的逻辑 2017-07-12 21:13:22 +08:00
sean
51a3f9d971 merge dev to local 2017-07-12 20:47:33 +08:00
sean
3312c7d3ec add chrome_ext 2017-07-12 20:47:20 +08:00
zwjamnsss
b944046a38 remove 2017-07-12 17:17:52 +08:00
zwjamnsss
603cbe6118 none 2017-07-12 17:17:15 +08:00
wenbo.dong
cff1e476f8 e branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 17:03:18 +08:00
wenbo.dong
822ba2f746 add: 修改文件大小写 2017-07-12 17:03:15 +08:00
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