wangshusheng / YOHOBUYPC · Commits

23 Nov, 2015

40 commits

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d7ffda0b

by hf
2015-11-23 20:51:20 +0800
Browse Files
do modify template name use _ to -
10207514

by hf
2015-11-23 20:51:10 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
75f7edfb

by Lynnic
2015-11-23 20:31:59 +0800
Browse Files
update
db69eddf

by Lynnic
2015-11-23 20:31:30 +0800
Browse Files
添加浏览记录接口
2dbb672c

by Rock Zhang
2015-11-23 20:25:21 +0800
Browse Files
update
66987990

by Lynnic
2015-11-23 19:42:46 +0800
Browse Files
update
ebda7935

by Lynnic
2015-11-23 19:11:22 +0800
Browse Files
do add static/dist files
598fa250

by hf
2015-11-23 19:06:01 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f7e0abec

by yangyang
2015-11-23 19:01:11 +0800
Browse Files
修改了一些代码写法问题
6e9db416

by yangyang
2015-11-23 18:59:57 +0800
Browse Files
merge develop static/dist
ce3470b6

by Lynnic
2015-11-23 18:57:09 +0800
Browse Files
update
a6b7e0b5

by Lynnic
2015-11-23 18:34:21 +0800
Browse Files
goods tags
4e040a4e

by Lynnic
2015-11-23 18:17:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d27480d5

by uedxwg
2015-11-23 18:06:14 +0800
Browse Files
update
9068f7a6

by uedxwg
2015-11-23 18:05:27 +0800
Browse Files
brand collect bug fix
c56d2fc4

by xuqi
2015-11-23 18:01:54 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
092a75c6

by ccbikai
2015-11-23 17:47:19 +0800
Browse Files
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
update
1a5303e8

by Lynnic
2015-11-23 16:39:21 +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
update
5dd7a5f6

by Lynnic
2015-11-23 16:29:15 +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
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0cbeac7d

by ccbikai
2015-11-23 16:05:54 +0800
Browse Files
增加字体资源
df68bfee

by ccbikai
2015-11-23 16:05:45 +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