fe / YOHOBUYWAP · Commits

06 May, 2016

8 commits

Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4
51af2419

by 周少峰
2016-05-06 11:08:51 +0800
Browse Files
add fav and cancel
ac7cc7d7

by 周少峰
2016-05-06 11:08:38 +0800
Browse Files
js 编译
8fa597a2

by yyq
2016-05-06 10:10:53 +0800
Browse Files
Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4
8f5b8186

by yyq
2016-05-06 10:09:14 +0800
Browse Files
首页
a9207422

by zhangxiaoru
2016-05-06 10:11:26 +0800
Browse Files
首页
b31bbf8d

by zhangxiaoru
2016-05-06 10:10:55 +0800
Browse Files
js 编译
a7c5797d

by yyq
2016-05-06 10:08:50 +0800
Browse Files
Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4
60954cca

by 周少峰
2016-05-06 09:48:36 +0800
Browse Files

05 May, 2016

21 commits

js 编译
00ef64d8

by yyq
2016-05-05 20:32:33 +0800
Browse Files
shop.js
4572bf74

by zhangxiaoru
2016-05-05 18:58:27 +0800
Browse Files
Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4
b1de7137

by 周少峰
2016-05-05 18:58:25 +0800
Browse Files
app url
a98f8294

by 周少峰
2016-05-05 18:57:39 +0800
Browse Files
店铺
3b8f8e6e

by zhangxiaoru
2016-05-05 17:26:59 +0800
Browse Files
店铺
21750cfc

by zhangxiaoru
2016-05-05 17:18:50 +0800
Browse Files
Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4 ...
3f3c09b2
```
 the commit.
```
by 郭成尧
2016-05-05 10:59:01 +0800
Browse Files
shopId判断
c7917cc5

by 郭成尧
2016-05-05 10:58:47 +0800
Browse Files
首页全部商品
a02702d9

by zhangxiaoru
2016-05-05 10:58:08 +0800
Browse Files
首页全部商品
aef8523c

by zhangxiaoru
2016-05-05 10:57:36 +0800
Browse Files
Merge branch 'develop' into release/4.4
9621bbc3

by liangxs
2016-05-05 10:49:16 +0800
Browse Files
Merge branch 'feature/limitcode' into develop
96386c09

by liangxs
2016-05-05 10:47:39 +0800
Browse Files
合并分支到release4.4
e4acb378

by 郭成尧
2016-05-05 10:33:01 +0800
Browse Files
限制码颜色尺寸选择
d2851e3b

by liangxs
2016-05-05 10:25:25 +0800
Browse Files
详情页品牌列表添加
be48429b

by 郭成尧
2016-05-05 10:24:27 +0800
Browse Files
Merge branch 'feature/mBrandShop' into release/4.4
b74f29bd

by 周少峰
2016-05-05 10:12:04 +0800
Browse Files
app test
19ef0207

by 周少峰
2016-05-05 10:03:44 +0800
Browse Files
品牌店铺
77eac19e

by zhangxiaoru
2016-05-05 09:57:39 +0800
Browse Files
保留测试数据并注释
597be514

by 郭成尧
2016-05-05 09:51:20 +0800
Browse Files
一个商品多个店铺关联
8bfa1153

by 郭成尧
2016-05-05 09:49:51 +0800
Browse Files
Merge branch 'feature/mBrandShop' into develop ...
6b33eed6
```
Conflicts:
	library/Api/Yohobuy.php
	template/m.yohobuy.com/partials/layout/use.phtml
```
by 杨延青
2016-05-05 09:34:49 +0800
Browse Files

04 May, 2016

11 commits

app direct
f320b316

by 周少峰
2016-05-04 20:28:38 +0800
Browse Files
app location href
eb5dcad6

by 周少峰
2016-05-04 20:09:09 +0800
Browse Files
Merge branch 'feature/mBrandShop' of http://git.dev.yoho.cn/web/yohobuywap into feature/mBrandShop
433eced0

by 周少峰
2016-05-04 19:47:06 +0800
Browse Files
hide part in app
18bd4ccc

by 周少峰
2016-05-04 19:47:00 +0800
Browse Files
店铺首页
7cd0b8c6

by zhangxiaoru
2016-05-04 19:37:49 +0800
Browse Files
店铺收藏
07541890

by zhangxiaoru
2016-05-04 18:30:57 +0800
Browse Files
店铺收藏
bf52e5d9

by zhangxiaoru
2016-05-04 18:30:40 +0800
Browse Files
add shopId
4f6ed000

by 周少峰
2016-05-04 18:02:36 +0800
Browse Files
Merge branch 'feature/mBrandShop' of http://git.dev.yoho.cn/web/yohobuywap into feature/mBrandShop
181d7dbb

by 周少峰
2016-05-04 17:56:49 +0800
Browse Files
add app_version
b6cdf2b6

by 周少峰
2016-05-04 17:56:34 +0800
Browse Files
店铺id
1175abff

by zhangxiaoru
2016-05-04 17:51:27 +0800
Browse Files