fe / YOHO-ACTIVITY-PHP · Commits

17 Oct, 2015

12 commits

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

by hf
2015-10-17 17:00:02 +0800
Browse Files
update
e767609f

by 梁志锋
2015-10-17 16:59:32 +0800
Browse Files
update
c43c7209

by 梁志锋
2015-10-17 16:48:42 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
54f157e7

by hf
2015-10-17 16:37:42 +0800
Browse Files
do test generate static html to page cache
d1138832

by hf
2015-10-17 16:37:33 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
7cf8ac1c

by 梁志锋
2015-10-17 16:33:48 +0800
Browse Files
update
2329b911

by 梁志锋
2015-10-17 16:32:52 +0800
Browse Files
update
729cc4fd

by 梁志锋
2015-10-17 16:32:03 +0800
Browse Files
do new sale js ajax call paging
cab2a402

by hf
2015-10-17 15:51:17 +0800
Browse Files
remove css folder
d913bfea

by xuqi
2015-10-17 14:29:19 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f0ce4a4c

by xuqi
2015-10-17 14:28:14 +0800
Browse Files
pkg gulpfile
b0f92aff

by xuqi
2015-10-17 14:25:57 +0800
Browse Files

16 Oct, 2015

28 commits

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

by hf
2015-10-17 00:10:08 +0800
Browse Files
update
d39a9731

by 梁志锋
2015-10-17 00:09:34 +0800
Browse Files
update
116fa4b8

by 梁志锋
2015-10-17 00:00:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e13c0549

by hf
2015-10-17 00:00:06 +0800
Browse Files
update
92917887

by 梁志锋
2015-10-16 23:59:22 +0800
Browse Files
modify to ignore assets path
481bf2da

by hf
2015-10-16 22:54:19 +0800
Browse Files
do home show boys girls page
f70905ea

by hf
2015-10-16 22:35:36 +0800
Browse Files
do home select channel
bf770ffe

by hf
2015-10-16 22:06:12 +0800
Browse Files
do home select channel
70d6a34b

by hf
2015-10-16 21:41:58 +0800
Browse Files
do home select channel
0fb7401d

by hf
2015-10-16 21:37:15 +0800
Browse Files
update
5df4e9e0

by 梁志锋
2015-10-16 21:36:15 +0800
Browse Files
update
60e32781

by 梁志锋
2015-10-16 21:34:37 +0800
Browse Files
update
97542741

by 梁志锋
2015-10-16 21:33:39 +0800
Browse Files
static img in html -> css use
bc70c241

by xuqi
2015-10-16 21:18:20 +0800
Browse Files
pkg zepto lazyload
d1b4cd0e

by xuqi
2015-10-16 20:57:37 +0800
Browse Files
update files
191a31f0

by 梁志锋
2015-10-16 19:57:19 +0800
Browse Files
修改频道选择页传递的数据格式“
5323e058

by Rock Zhang
2015-10-16 16:40:24 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
6b10bd0a

by Rock Zhang
2015-10-16 16:01:41 +0800
Browse Files
去除一些无用的数据
fe5a73b2

by Rock Zhang
2015-10-16 16:01:33 +0800
Browse Files
plus star prise
969573a8

by xuqi
2015-10-16 15:33:44 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c2625939

by xuqi
2015-10-16 15:31:46 +0800
Browse Files
modify to add production cache config
832771f2

by hf
2015-10-16 15:31:09 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
cba11d19

by xuqi
2015-10-16 15:30:47 +0800
Browse Files
modify to add production cache config
8f939036

by hf
2015-10-16 15:30:18 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
5b468159
```
Conflicts:
	yohobuy/m.yohobuy.com/application/modules/Product/controllers/Newsale.php
```
by Rock Zhang
2015-10-16 15:13:31 +0800
Browse Files
修改新品，折扣模块的数据处理，添加频道选择页的数据格式
320ea26c

by Rock Zhang
2015-10-16 15:11:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
8814e340

by xuqi
2015-10-16 14:50:42 +0800
Browse Files
update files
efed691c

by 梁志锋
2015-10-16 14:38:41 +0800
Browse Files