fe / YOHOBUYWAP · Commits

16 Oct, 2015

18 commits

去除一些无用的数据
fe5a73b2

by Rock Zhang
2015-10-16 16:01:33 +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
update files
efed691c

by 梁志锋
2015-10-16 14:38:41 +0800
Browse Files
调整文件夹结构
8f9fd403

by 梁志锋
2015-10-16 14:37:24 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
646cb513

by Rock Zhang
2015-10-16 14:12:13 +0800
Browse Files
do maylike and guang opt
7b3347d4

by hf
2015-10-16 14:11:45 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
493f9afc

by hf
2015-10-16 14:08:17 +0800
Browse Files
do maylike and guang opt
1960ebb9

by hf
2015-10-16 14:08:06 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
4ca32e66

by Rock Zhang
2015-10-16 12:54:32 +0800
Browse Files
修改newsale数据处理逻辑
4f28eac1

by Rock Zhang
2015-10-16 12:54:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d9841c30

by xuqi
2015-10-16 10:53:39 +0800
Browse Files
showTag -> showTags
44fe723a

by xuqi
2015-10-16 10:53:28 +0800
Browse Files
update fiiles
01df33bc

by 梁志锋
2015-10-16 10:47:29 +0800
Browse Files
guang info list loadmore
e04cad4f

by xuqi
2015-10-16 10:33:26 +0800
Browse Files
fixes bug to ajax render template
b5a550c3

by hf
2015-10-16 09:57:28 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
51075526

by 梁志锋
2015-10-16 09:29:36 +0800
Browse Files
update files
64638e31

by 梁志锋
2015-10-16 09:29:10 +0800
Browse Files

15 Oct, 2015

22 commits

第三方登录有关页面链接的添加
1b04610f

by Rock Zhang
2015-10-15 23:30:13 +0800
Browse Files
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