wangshusheng / YOHOBUYPC · Commits

20 Jul, 2016

1 commit

product_id to productId
56d9f8f2

by 周少峰
2016-07-20 11:30:57 +0800
Browse Files

19 Jul, 2016

10 commits

4.8.2
93cac54d

by 梁志锋
2016-07-19 14:45:28 +0800
Browse Files
4.8.2
13549e89

by 梁志锋
2016-07-19 14:29:56 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/release/4.8'
de740ef7

by 梁志锋
2016-07-19 14:28:01 +0800
Browse Files
4.8.1
756feb5b

by 梁志锋
2016-07-19 13:59:32 +0800
Browse Files
Merge remote-tracking branch 'origin/release/4.8' into release/4.8 ...
e22eaef9
```
# Conflicts:
#	yohobuy/www.yohobuy.com/application/models/Product/Item.php
```
by 梁志锋
2016-07-19 13:54:48 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/feature/order-show' into release/4.8
cf6e3c46

by 梁志锋
2016-07-19 13:44:09 +0800
Browse Files
错误页跳转修改
d7c9b546

by cailing
2016-07-19 10:57:35 +0800
Browse Files
线上错误页跳转
c7ca1441

by cailing
2016-07-19 10:09:22 +0800
Browse Files
gulp ge 4.8.0
4e74ff16

by 郝肖肖
2016-07-19 10:01:07 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/release/4.8'
86ec2345

by 梁志锋
2016-07-19 09:35:09 +0800
Browse Files

18 Jul, 2016

24 commits

Merge branch 'release/4.8' of git.yoho.cn:fe/YOHOBUYPC into release/4.8
4fbfa344

by 郝肖肖
2016-07-18 17:57:46 +0800
Browse Files
加减购物车商品失败提示
06666ee2

by 郝肖肖
2016-07-18 17:57:22 +0800
Browse Files
Merge branch 'release/4.8'
a06b2dd6

by 毕凯
2016-07-18 17:54:49 +0800
Browse Files
Merge branch 'release/4.8' of git.yoho.cn:fe/YOHOBUYPC into release/4.8
f79b8a68

by 郭成尧
2016-07-18 17:49:59 +0800
Browse Files
'bugfixed'
c0ae1932

by 郭成尧
2016-07-18 17:49:42 +0800
Browse Files
Merge branch 'release/4.8' of git.yoho.cn:fe/YOHOBUYPC into release/4.8
9f656bcd

by 郝肖肖
2016-07-18 17:40:30 +0800
Browse Files
加入购物车失败，弹框提示
2bea43f8

by 郝肖肖
2016-07-18 17:39:52 +0800
Browse Files
Merge branch 'release/4.8'
600ab318

by 毕凯
2016-07-18 17:28:49 +0800
Browse Files
CartData冲突解决
2b95758d

by 郭成尧
2016-07-18 17:21:16 +0800
Browse Files
Merge branch 'release/4.8' of git.yoho.cn:fe/YOHOBUYPC into release/4.8
cf64bfaf

by 郭成尧
2016-07-18 17:17:36 +0800
Browse Files
shop冲突解决
f8b6954b

by 郭成尧
2016-07-18 17:17:17 +0800
Browse Files
Merge branch 'release/4.8' of git.yoho.cn:fe/YOHOBUYPC into release/4.8
d8067e41

by 毕凯
2016-07-18 17:08:37 +0800
Browse Files
Merge branch 'master' into release/4.8
4e4a0c09

by 毕凯
2016-07-18 17:08:32 +0800
Browse Files
解决冲突
2383c31a

by 毕凯
2016-07-18 17:08:08 +0800
Browse Files
'conflict'
4ccaeb69

by 郭成尧
2016-07-18 17:06:15 +0800
Browse Files
gulp ge
604601d6

by 毕凯
2016-07-18 17:04:28 +0800
Browse Files
Merge branch 'master' into release/4.8
5e09f68b

by 毕凯
2016-07-18 16:57:12 +0800
Browse Files
升级版本
127a607a

by 毕凯
2016-07-18 16:56:54 +0800
Browse Files
Merge branch 'master' into release/4.8
40ef4566

by 毕凯
2016-07-18 16:53:44 +0800
Browse Files
合并冲突
c6d2c493

by 毕凯
2016-07-18 16:53:25 +0800
Browse Files
Merge branch 'release/4.8'
333e67ed

by 毕凯
2016-07-18 16:22:36 +0800
Browse Files
Merge branch 'master' into release/4.8
ffd00c56

by 毕凯
2016-07-18 16:07:53 +0800
Browse Files
show invoice back
5b2072d2

by 周少峰
2016-07-18 14:49:32 +0800
Browse Files
show invoice
a0ec2557

by 周少峰
2016-07-18 14:06:11 +0800
Browse Files

15 Jul, 2016

5 commits

日志处理优化
d31dc8a8

by 梁志锋
2016-07-15 16:38:46 +0800
Browse Files
gulp ge
757f1c57

by 张丽霞
2016-07-15 13:50:31 +0800
Browse Files
电子发票bug
f08ceb4b

by 张丽霞
2016-07-15 13:46:31 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/hotfix/loophole'
7bcc4191

by 梁志锋
2016-07-15 13:06:47 +0800
Browse Files
modify encryption
b6661d8f

by 周少峰
2016-07-15 12:47:53 +0800
Browse Files