wangshusheng / YOHOBUYPC · Commits

22 Jan, 2016

40 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
626a005d

by 周少峰
2016-01-22 20:44:40 +0800
Browse Files
修改
9138ed76

by 周少峰
2016-01-22 20:44:34 +0800
Browse Files
hotrank修改
2daaf7ec

by cailing
2016-01-22 18:27:05 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
fe8569db

by 周少峰
2016-01-22 18:21:55 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4da0a289

by unknown
2016-01-22 18:15:39 +0800
Browse Files
验证密码规则 @review by 王成龙
4230e011

by unknown
2016-01-22 18:15:25 +0800
Browse Files
代码整理
b2466185

by 毕凯
2016-01-22 18:08:23 +0800
Browse Files
取消错误代码
704d95f0

by 毕凯
2016-01-22 18:02:04 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e6e7a7a1

by 毕凯
2016-01-22 17:59:36 +0800
Browse Files
Merge branch 'feature/web/search' into develop
e4a1ffb2

by 毕凯
2016-01-22 17:59:30 +0800
Browse Files
获取图片之前，先把获取上一张图片的ajax请求取消
1ed20d72

by 毕凯
2016-01-22 17:59:21 +0800
Browse Files
晒选课尺寸不重新加载
f94bbd32

by 毕凯
2016-01-22 17:52:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
2e33b9c5

by yyqing
2016-01-22 17:49:57 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
0c0d23c8

by 周少峰
2016-01-22 17:48:27 +0800
Browse Files
品牌列表模板更改：review by @杨延青
8457ed01

by yyqing
2016-01-22 17:47:37 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
049579b4

by 周少峰
2016-01-22 17:28:05 +0800
Browse Files
名牌名称组合处理，品牌更多、多选优化
686b6101

by 周少峰
2016-01-22 17:17:03 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
cd78ef65

by unknown
2016-01-22 16:58:30 +0800
Browse Files
找回密码校验及logobrand js @review by 王成龙
d8251584

by unknown
2016-01-22 16:58:08 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
86275923

by uedxwg
2016-01-22 16:39:07 +0800
Browse Files
导航修改
d949fdc2

by uedxwg
2016-01-22 16:38:50 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
716a61ed

by 毕凯
2016-01-22 16:36:53 +0800
Browse Files
收藏品牌商品未登录时跳转
521ed168

by 毕凯
2016-01-22 16:36:47 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list
551c1f6e

by yangyang
2016-01-22 16:19:33 +0800
Browse Files
修改导航条不根据cookie变得bug
bb03ad11

by yangyang
2016-01-22 16:19:24 +0800
Browse Files
产品from参数，搜索的品牌分类不变，开启缓存
0b77933c

by 周少峰
2016-01-22 15:50:03 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6a470079

by uedxwg
2016-01-22 15:15:29 +0800
Browse Files
个人中心导航列表显示
db624f76

by uedxwg
2016-01-22 15:14:51 +0800
Browse Files
简单头部登陆状态同步：review by @杨延青
a6dc9d8d

by yyqing
2016-01-22 13:51:17 +0800
Browse Files
helper
68a19179

by whb
2016-01-22 13:16:29 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
afc510e9

by wangqing
2016-01-22 12:19:03 +0800
Browse Files
修正thirdlogin
8f419993

by wangqing
2016-01-22 12:18:41 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list
6efff65c

by yangyang
2016-01-22 11:16:45 +0800
Browse Files
广告位格式调整
f3c96394

by yangyang
2016-01-22 11:16:37 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
4a440fd5
```
Conflicts:
	web-static/js/product/product.js
```
by lore-w
2016-01-22 11:09:23 +0800
Browse Files
product.js代码检查问题
20a713bf

by lore-w
2016-01-22 11:03:43 +0800
Browse Files
鼠标移出商品图，隐藏商品信息
7ccc8fb9

by 毕凯
2016-01-22 11:00:54 +0800
Browse Files
控制器传controller值
644fe508

by yangyang
2016-01-22 10:44:10 +0800
Browse Files
修改品牌控制器结构
3d6d3c07

by yangyang
2016-01-22 10:39:32 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
88a7c677

by 周少峰
2016-01-22 09:36:01 +0800
Browse Files