fe / YOHOBUYWAP · Commits

13 Oct, 2015

40 commits

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

by hf
2015-10-13 21:53:31 +0800
Browse Files
do test login and register
2cdaa8f0

by hf
2015-10-13 21:53:22 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
05e1e587

by Rock Zhang
2015-10-13 21:53:08 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
5d00aada
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Boys.php
	yohobuy/m.yohobuy.com/application/controllers/Girls.php
```
by Rock Zhang
2015-10-13 21:52:56 +0800
Browse Files
do test login and register
e70fc289

by hf
2015-10-13 21:51:42 +0800
Browse Files
首页数据，楼层代码构建
5f4ce30a

by Rock Zhang
2015-10-13 21:50:45 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
6bbcb9e1

by 梁志锋
2015-10-13 21:46:05 +0800
Browse Files
update files
d215d4c4

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

by xuqi
2015-10-13 21:34:31 +0800
Browse Files
country code -> area code
3a8bc8e6

by xuqi
2015-10-13 21:34:10 +0800
Browse Files
update files
3d309fe8

by 梁志锋
2015-10-13 21:34:03 +0800
Browse Files
do test login and register
bca9775a

by hf
2015-10-13 21:32:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1365d09a

by hf
2015-10-13 21:18:30 +0800
Browse Files
countryCode->areaCode
34bee044

by xuqi
2015-10-13 21:17:59 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
389ee6cc

by hf
2015-10-13 21:14:45 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
25db5697

by 梁志锋
2015-10-13 21:05:39 +0800
Browse Files
focus outline
d0a37802

by xuqi
2015-10-13 20:56:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b30cdec0

by hf
2015-10-13 20:53:38 +0800
Browse Files
do left side navigation
7ae286e7

by hf
2015-10-13 20:53:28 +0800
Browse Files
fix style bug of mobilecode
d1b94c97

by xuqi
2015-10-13 20:43:59 +0800
Browse Files
修改代码的一些字段名称
76a60f99

by Rock Zhang
2015-10-13 20:35:39 +0800
Browse Files
fix bug of getting mobile & areacode
57a15979

by xuqi
2015-10-13 20:03:44 +0800
Browse Files
update
a2197274

by 梁志锋
2015-10-13 19:58:43 +0800
Browse Files
unified ajax data attr
d2fc9824

by xuqi
2015-10-13 19:32:22 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
11b94506

by xuqi
2015-10-13 18:36:44 +0800
Browse Files
link test ajax
41b9a414

by xuqi
2015-10-13 18:36:26 +0800
Browse Files
update
63188e33

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

by xuqi
2015-10-13 18:15:20 +0800
Browse Files
back js bugs
69b66a16

by xuqi
2015-10-13 18:14:47 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
26c432d6

by 梁志锋
2015-10-13 18:11:32 +0800
Browse Files
update
f033064c

by 梁志锋
2015-10-13 18:11:02 +0800
Browse Files
fix bug caused by conflict
f185712f

by Rock Zhang
2015-10-13 18:04:24 +0800
Browse Files
修改一些接口数据格式“
df445bde

by Rock Zhang
2015-10-13 18:02:21 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
632903e2
```
Conflicts:
	library/Action/AbstractAction.php
	yohobuy/m.yohobuy.com/application/controllers/Girls.php
```
by Rock Zhang
2015-10-13 17:40:57 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b75ee23b

by xuqi
2015-10-13 17:39:26 +0800
Browse Files
new pwd
f14f38aa

by xuqi
2015-10-13 17:38:11 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
2756ec29

by hf
2015-10-13 17:25:59 +0800
Browse Files
do reg and login page
0c141f7b

by hf
2015-10-13 17:25:43 +0800
Browse Files
update
b7494cd8

by 梁志锋
2015-10-13 16:35:21 +0800
Browse Files
精简首页男生，女生，潮童，创意生活使用的接口公用Index的接口
90974c93

by Rock Zhang
2015-10-13 15:11:07 +0800
Browse Files