fe / YOHOBUYPC · Commits

19 Nov, 2015

1 commit

do product detail page
f92aeb6e

by hf
2015-11-19 18:06:23 +0800
Browse Files

18 Nov, 2015

39 commits

do merge develop code to fixes diff
9e026cbf

by hf
2015-11-18 19:30:03 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
72b4c357

by hf
2015-11-18 19:22:50 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
49db0e38

by Rock Zhang
2015-11-18 19:21:20 +0800
Browse Files
修改意见反馈上传图片返回的数据格式，修复js中merge错误的bug
6ee60bed

by Rock Zhang
2015-11-18 19:21:06 +0800
Browse Files
do modify home page uid
8dad24c6

by hf
2015-11-18 19:16:02 +0800
Browse Files
update ignore
c0aad4da

by 梁志锋
2015-11-18 19:14:50 +0800
Browse Files
update
78260cb5

by 梁志锋
2015-11-18 19:12:45 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1006add5

by 梁志锋
2015-11-18 19:09:45 +0800
Browse Files
add files for dist
411baed0

by 梁志锋
2015-11-18 19:08:23 +0800
Browse Files
do merge master modify category style and fixes guang bugs
90616967

by hf
2015-11-18 18:21:17 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a7a9fc3d

by 梁志锋
2015-11-18 18:20:01 +0800
Browse Files
update yas files
b974fe67

by 梁志锋
2015-11-18 18:15:53 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f097ed42

by hf
2015-11-18 18:03:36 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
8676d496
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by lore-w
2015-11-18 17:59:56 +0800
Browse Files
意见反馈
18922b62

by lore-w
2015-11-18 17:57:03 +0800
Browse Files
修复保存意见反馈接口的bug
1712abdd

by Rock Zhang
2015-11-18 17:32:22 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
db4b21eb

by Rock Zhang
2015-11-18 17:12:57 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
c4d431b8
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by Rock Zhang
2015-11-18 17:10:51 +0800
Browse Files
my guang load more
7c202f4a

by xuqi
2015-11-18 17:07:10 +0800
Browse Files
修复意见反馈上传图片返回的图片地址不正确的bug
129cc3c7

by Rock Zhang
2015-11-18 16:46:03 +0800
Browse Files
我的guang
c5230478

by xiaowei
2015-11-18 16:33:41 +0800
Browse Files
我的逛
3d712126

by xiaowei
2015-11-18 16:25:15 +0800
Browse Files
do modify category style
22f70ea6

by hf
2015-11-18 15:37:44 +0800
Browse Files
我的逛
9360dc9b

by xiaowei
2015-11-18 15:36:57 +0800
Browse Files
stand alone my-guang info partials for load more render
80f999d1

by xuqi
2015-11-18 15:24:40 +0800
Browse Files
my guang
78b59ce4

by xuqi
2015-11-18 15:20:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
318314b0

by xuqi
2015-11-18 15:15:49 +0800
Browse Files
do modify category style
ef642b52

by hf
2015-11-18 15:10:44 +0800
Browse Files
我的逛数据结构修改
08941f83

by xiaowei
2015-11-18 15:04:02 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
3f7afe43

by ccbikai
2015-11-18 14:44:46 +0800
Browse Files
顶部图标点击背景变色
647c8c4e

by ccbikai
2015-11-18 14:44:36 +0800
Browse Files
expand load more url of guang info to unit js
56778691

by xuqi
2015-11-18 14:35:10 +0800
Browse Files
取消订单小问题
9c014848

by yangyang
2015-11-18 14:24:19 +0800
Browse Files
解决了冲突
524110f1

by yangyang
2015-11-18 14:12:27 +0800
Browse Files
去除意见反馈页一些多余的信息
4f9d1574

by Rock Zhang
2015-11-18 14:05:07 +0800
Browse Files
完善一些代码格式，为添加程序备注，完成随便逛逛url获取
45739460

by yangyang
2015-11-18 14:04:42 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4443432d

by hf
2015-11-18 14:00:42 +0800
Browse Files
do merge develop code
1f93e88e

by hf
2015-11-18 14:00:36 +0800
Browse Files
我的逛
a11cb454

by xiaowei
2015-11-18 13:52:08 +0800
Browse Files