wangshusheng / YOHOBUYPC · Commits

13 Oct, 2015

22 commits

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
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
525a6fe2

by Rock Zhang
2015-10-13 14:19:18 +0800
Browse Files
update files
8bd142ff

by 梁志锋
2015-10-13 14:18:47 +0800
Browse Files
do register page
e2d8c2b5

by hf
2015-10-13 14:16:29 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
42ac8fc9

by hf
2015-10-13 14:15:08 +0800
Browse Files
do register page
f37ae1de

by hf
2015-10-13 14:14:57 +0800
Browse Files
update files
ad08c88d

by 梁志锋
2015-10-13 11:49:37 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
853d2421

by 梁志锋
2015-10-13 11:47:50 +0800
Browse Files
update files
d7aa1a3d

by 梁志锋
2015-10-13 11:47:19 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
2c1c6b69

by Rock Zhang
2015-10-13 11:23:06 +0800
Browse Files
else if -> if
93c78936

by xuqi
2015-10-13 11:15:18 +0800
Browse Files
zepto ajax
8da6f058

by xuqi
2015-10-13 11:03:07 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
c57a47d1

by Rock Zhang
2015-10-13 10:59:49 +0800
Browse Files
修改第三方登录有关
90130d8f

by Rock Zhang
2015-10-13 10:59:44 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e251b299

by xuqi
2015-10-13 10:32:43 +0800
Browse Files
new js entry
17d602fc

by xuqi
2015-10-13 10:32:05 +0800
Browse Files

12 Oct, 2015

13 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
6619a596

by Rock Zhang
2015-10-12 21:04:16 +0800
Browse Files
找回密码页面套取初步实现
8c19b8dc

by Rock Zhang
2015-10-12 21:04:05 +0800
Browse Files
do plusstar list and detail page
852cc560

by hf
2015-10-12 21:02:14 +0800
Browse Files
do plusstar list and detail page
163acd0c

by hf
2015-10-12 21:01:09 +0800
Browse Files
reset head
de5accda

by xuqi
2015-10-12 20:56:27 +0800
Browse Files
new footer seajs use
a80f6aa7

by xuqi
2015-10-12 20:54:00 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
ccafa83d
```
Conflicts:
	library/LibModels/Wap/Passport/LoginData.php
	library/Plugin/Helpers.php
```
by Rock Zhang
2015-10-12 20:32:56 +0800
Browse Files
完成第三方登录，完善一些缺失的接口（品牌，品类）
2b7a5f8e

by Rock Zhang
2015-10-12 20:29:53 +0800
Browse Files
do register login call api data model
b64ee2c4

by hf
2015-10-12 20:17:59 +0800
Browse Files
do plustar template
818b87d8

by hf
2015-10-12 15:41:52 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
63266ac6

by Rock Zhang
2015-10-12 14:38:26 +0800
Browse Files
完成找回密码功能
95823607

by Rock Zhang
2015-10-12 14:38:20 +0800
Browse Files
Merge branch 'feature/plus-star' into develop ...
9cf42ab9
```
Conflicts:
	yohobuy/m.yohobuy.com/application/modules/Guang/controllers/Plusstar.php
```
by xuqi
2015-10-12 09:16:57 +0800
Browse Files

10 Oct, 2015

5 commits

do merge library/Plugin/Helpers.php
4cc8ff16

by hf
2015-10-10 18:57:37 +0800
Browse Files
do guang list and detail data model
4918f632

by hf
2015-10-10 18:56:03 +0800
Browse Files
第三方登录，找回密码功能添加
bcec4edc

by Rock Zhang
2015-10-10 18:50:13 +0800
Browse Files
plus+star list
db4b41df

by xuqi
2015-10-10 18:13:49 +0800
Browse Files
build tip plugin
150f4a72

by xuqi
2015-10-10 16:09:29 +0800
Browse Files