wangshusheng / YOHOBUYPC · Commits

16 Dec, 2015

18 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
446b030f

by Rock Zhang
2015-12-16 11:24:00 +0800
Browse Files
有货购物车商品，加价购商品以及赠品数据的接口处理逻辑 ...
ec2c30e1
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 11:23:28 +0800
Browse Files
code review by hf: do modify shopping cart name
fca40144

by hf
2015-12-16 10:53:25 +0800
Browse Files
code review by hf: do gulp ge to gzip css and js
2a4dd185

by hf
2015-12-16 10:33:31 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
21da2389

by Rock Zhang
2015-12-16 10:20:54 +0800
Browse Files
Merge branch 'feature/cart' into develop
6fe0b279

by Rock Zhang
2015-12-16 10:20:47 +0800
Browse Files
去除打印语句
b00fbc75

by Rock Zhang
2015-12-16 10:20:35 +0800
Browse Files
code review by hf: do gulp ge to gzip css and js
66005fbf

by hf
2015-12-16 10:18:05 +0800
Browse Files
code review by hf: do format user.php code
6845f2ec

by hf
2015-12-16 10:10:48 +0800
Browse Files
添加加价购和赠品页面路由
ecf69b32

by Rock Zhang
2015-12-16 10:09:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
04d79d3b

by hf
2015-12-16 10:05:21 +0800
Browse Files
Merge branch 'feature/cart' into develop
f794dbee

by Rock Zhang
2015-12-16 09:41:02 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
377306b6

by Rock Zhang
2015-12-16 09:40:36 +0800
Browse Files
赠品和加价购标志只保留一个 ...
fe343143
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 09:40:04 +0800
Browse Files
code review by hf: do feature 1.2.1 to test
7d02506e

by hf
2015-12-16 09:39:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6a8d04ef

by hf
2015-12-16 09:27:53 +0800
Browse Files
code review by hf: do add cuxiao newuser coupon second times
cc815f2a

by hf
2015-12-16 09:27:44 +0800
Browse Files
Merge branch 'feature/youhuiquan' into develop
fc3c466f

by hf
2015-12-16 09:26:01 +0800
Browse Files

15 Dec, 2015

22 commits

购物车功能
e992e267

by 梁志锋
2015-12-16 00:15:47 +0800
Browse Files
购物车功能
dc760085

by 梁志锋
2015-12-16 00:15:38 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
c4f013fe

by 梁志锋
2015-12-15 23:36:52 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
116d2ea9

by 梁志锋
2015-12-15 23:26:44 +0800
Browse Files
购物车功能
4a034d77

by 梁志锋
2015-12-15 23:26:21 +0800
Browse Files
Merge branch 'feature/bindMobile' into 'develop' ...
a5f18d27
```
第三方平台登录后绑定手机

See merge request !32
```
by 梁志锋
2015-12-15 23:19:17 +0800
Browse Files
update for bind mobile page. code review by LZF
b9a1742d

by biao
2015-12-15 23:13:59 +0800
Browse Files
update for bind mobile. code review by LZF
f2bde703

by biao
2015-12-15 23:13:16 +0800
Browse Files
'代码冲突修改'
8ee2d89b

by uedxwg
2015-12-15 23:10:26 +0800
Browse Files
'样式冲突修改'
65a97994

by uedxwg
2015-12-15 23:06:31 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
4b72d481

by Lynnic
2015-12-15 23:03:09 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e9158021

by xiaowei
2015-12-15 23:02:15 +0800
Browse Files
手机绑定
10db6940

by xiaowei
2015-12-15 23:02:07 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/bindMobile
5fd57f9d

by biao
2015-12-15 23:01:57 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
297a61e3

by Lynnic
2015-12-15 22:59:00 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart ...
9473d1a7
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/ShoppingCart.php
```
by Lynnic
2015-12-15 22:57:45 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b071cc8b

by hf
2015-12-15 22:57:36 +0800
Browse Files
code review by hf: do modify product detail page add to cart code
d9ce84b1

by hf
2015-12-15 22:57:28 +0800
Browse Files
购物车功能
da7a41e2

by 梁志锋
2015-12-15 22:51:17 +0800
Browse Files
'购物车商品详情'
6c00f57b

by uedxwg
2015-12-15 22:50:44 +0800
Browse Files
'购物车商品详情'
3bf0374b

by uedxwg
2015-12-15 22:50:30 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/bindMobile
11b726ce

by biao
2015-12-15 22:45:25 +0800
Browse Files