chenchao / YOHOBUYPC · Commits

15 Oct, 2015

40 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
9c88afa6

by 梁志锋
2015-10-15 22:06:00 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
2d87bb3a

by hf
2015-10-15 21:59:49 +0800
Browse Files
do guang list and detail page
75ba82a8

by hf
2015-10-15 21:59:39 +0800
Browse Files
guang detail data structure
1ff4f3d8

by xuqi
2015-10-15 21:07:33 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
86319e0c

by 梁志锋
2015-10-15 20:46:27 +0800
Browse Files
update files
a60eef4f

by 梁志锋
2015-10-15 20:46:05 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
fb21da1b

by xuqi
2015-10-15 20:42:53 +0800
Browse Files
env variable
a01315f8

by xuqi
2015-10-15 20:05:04 +0800
Browse Files
guang list api
1b541b26

by xuqi
2015-10-15 20:01:56 +0800
Browse Files
update files
16db7077

by 梁志锋
2015-10-15 19:57:15 +0800
Browse Files
update files
7886bdb7

by 梁志锋
2015-10-15 19:52:58 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
124d6941

by xuqi
2015-10-15 19:10:47 +0800
Browse Files
dist gulpfile
2ca52512

by xuqi
2015-10-15 19:10:31 +0800
Browse Files
pkg inside
b99d23cc

by xuqi
2015-10-15 18:31:41 +0800
Browse Files
修改数据处理插件的目录结构，初步完成新品到着，折扣专区的数据结构组装
4d5837a1

by Rock Zhang
2015-10-15 18:26:08 +0800
Browse Files
dist dep
10c9f48f

by xuqi
2015-10-15 18:10:09 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
096b18f3

by Rock Zhang
2015-10-15 16:40:49 +0800
Browse Files
完善首页以及频道页的模板，添加分类数据处理类，初步完成分类模块
393fadca

by Rock Zhang
2015-10-15 16:40:43 +0800
Browse Files
new&sale的模板修改
6f21bd5b

by 梁志锋
2015-10-15 16:39:00 +0800
Browse Files
plus star spread arrow style
b0176bcd

by xuqi
2015-10-15 16:28:23 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
162e49c3
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Girls.php
```
by Rock Zhang
2015-10-15 15:50:35 +0800
Browse Files
category style bug
d1a2b989

by xuqi
2015-10-15 15:48:46 +0800
Browse Files
ps lazyload
a8cd7794

by xuqi
2015-10-15 15:48:21 +0800
Browse Files
fix height if ps list row
8805f68c

by xuqi
2015-10-15 15:35:57 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6b58b024

by hf
2015-10-15 15:27:42 +0800
Browse Files
do guang list page
ec2a69da

by hf
2015-10-15 15:27:38 +0800
Browse Files
info prise & collect
eb98171f

by xuqi
2015-10-15 14:48:58 +0800
Browse Files
update files
43a39991

by 梁志锋
2015-10-15 14:40:38 +0800
Browse Files
update files
cc6f5d48

by 梁志锋
2015-10-15 14:33:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
7c42ce11

by xuqi
2015-10-15 14:02:15 +0800
Browse Files
info icon change
a29b195c

by xuqi
2015-10-15 14:01:57 +0800
Browse Files
guang info author
5f20a822

by xuqi
2015-10-15 13:51:01 +0800
Browse Files
update files
0ca3501e

by 梁志锋
2015-10-15 11:54:51 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
0e4ca9d6

by Rock Zhang
2015-10-15 11:37:55 +0800
Browse Files
修改女首有关的一些模板”
8a5ca8cb

by Rock Zhang
2015-10-15 11:37:50 +0800
Browse Files
update files
c18dceea

by 梁志锋
2015-10-15 10:44:47 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c010027b

by xuqi
2015-10-15 10:29:35 +0800
Browse Files
guang js entry
432f3631

by xuqi
2015-10-15 10:29:21 +0800
Browse Files
update files
8058ae61

by 梁志锋
2015-10-15 10:21:39 +0800
Browse Files
update files
165ef30e

by 梁志锋
2015-10-15 10:20:42 +0800
Browse Files