fe / YOHO-ACTIVITY-PHP · Commits

23 Nov, 2015

40 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
ccec31ea
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by Rock Zhang
2015-11-23 17:07:30 +0800
Browse Files
修复等级信息中的bug，修复取消收藏商品的bug
81d0eb7d

by Rock Zhang
2015-11-23 17:02:47 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
8e2582ca

by uedxwg
2015-11-23 16:38:04 +0800
Browse Files
update
a22d5d23

by uedxwg
2015-11-23 16:37:02 +0800
Browse Files
modify fixes bug to my center
9b3e26e0

by hf
2015-11-23 16:25:27 +0800
Browse Files
modify fixes bug to my center
f9487fb6

by hf
2015-11-23 16:24:27 +0800
Browse Files
modify fixes bug to my center
de2dd50c

by hf
2015-11-23 16:21:10 +0800
Browse Files
modify fixes bug to my center
1bd16a02

by hf
2015-11-23 16:17:17 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
814b725e

by hf
2015-11-23 16:09:05 +0800
Browse Files
modify fixes bug to my center
bd61b8d4

by hf
2015-11-23 16:08:58 +0800
Browse Files
update
e4bdfcc4

by Lynnic
2015-11-23 16:08:03 +0800
Browse Files
do modify product detail page call api
75ace9d2

by hf
2015-11-23 16:03:33 +0800
Browse Files
do modify product detail page call api
713acee1

by hf
2015-11-23 16:01:34 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
edefb215

by Lynnic
2015-11-23 15:56:02 +0800
Browse Files
do feature 3.1 3.2 my center and detail page
78b15100

by hf
2015-11-23 15:55:29 +0800
Browse Files
update
5064a236

by Lynnic
2015-11-23 15:55:17 +0800
Browse Files
增加一间反馈入口
dc991f4b

by ccbikai
2015-11-23 15:39:08 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
9d923502

by ccbikai
2015-11-23 14:52:49 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
a452d631

by Lynnic
2015-11-23 14:23:24 +0800
Browse Files
update
5a85c162

by Lynnic
2015-11-23 14:21:10 +0800
Browse Files
上传图片可删除
96e2273a

by lore-w
2015-11-23 14:13:05 +0800
Browse Files
Merge branch 'test' of http://git.dev.yoho.cn/web/yohobuy into test
2c7452fd

by hf
2015-11-23 12:41:46 +0800
Browse Files
do feature 3.1 3.2 my center and detail page
f9afa578

by hf
2015-11-23 12:41:35 +0800
Browse Files
update
b2b6e53e

by Lynnic
2015-11-23 12:39:43 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
95fc398c

by hf
2015-11-23 12:27:53 +0800
Browse Files
do product detail page
f61aada7

by hf
2015-11-23 12:27:44 +0800
Browse Files
给意见反馈添加图片选项
13d1f97a

by Rock Zhang
2015-11-23 11:59:47 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
490d1961

by hf
2015-11-23 11:46:50 +0800
Browse Files
do product detail page
2bdd5923

by hf
2015-11-23 11:46:39 +0800
Browse Files
update
022612bb

by Lynnic
2015-11-23 11:25:53 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
c3bd53a0

by Lynnic
2015-11-23 11:18:06 +0800
Browse Files
update prod desc
36e6d733

by 梁志锋
2015-11-23 11:16:13 +0800
Browse Files
update
d3ab0da3

by Lynnic
2015-11-23 11:08:53 +0800
Browse Files
update
4858545e

by Lynnic
2015-11-23 10:56:35 +0800
Browse Files
update
7d296d45

by Lynnic
2015-11-23 10:52:44 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a8b8fa71

by 梁志锋
2015-11-23 10:48:41 +0800
Browse Files
product desc
3abd66df

by 梁志锋
2015-11-23 10:48:24 +0800
Browse Files
product desc
a53ef2e3

by 梁志锋
2015-11-23 10:48:09 +0800
Browse Files
添加意见反馈图片大小选项，添加我的收藏随便逛逛链接地址
02ce398d

by Rock Zhang
2015-11-23 10:23:35 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
fc840865

by Lynnic
2015-11-23 09:51:14 +0800
Browse Files