fe / YOHOBUYWAP · Commits

03 Dec, 2015

1 commit

do merge develop code to test
f4dd0ac4

by hf
2015-12-03 09:46:17 +0800
Browse Directory »

26 Nov, 2015

39 commits

Merge branch 'test' of http://git.dev.yoho.cn/web/yohobuy into test
b997085d

by hf
2015-11-26 20:34:00 +0800
Browse Files
do modify cuxiao coupon kids code
e5c73c7d

by hf
2015-11-26 20:33:51 +0800
Browse Files
更新到最新静态资源
af0ce514

by Rock Zhang
2015-11-26 20:04:10 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:web/yohobuy into test
51cac946

by Rock Zhang
2015-11-26 19:57:56 +0800
Browse Files
更新到最新静态资源
141a58ef

by Rock Zhang
2015-11-26 19:57:52 +0800
Browse Files
do cuxiao new user coupon feature
920ad591

by hf
2015-11-26 19:56:16 +0800
Browse Files
更新到最新静态资源
f93d3aab

by Rock Zhang
2015-11-26 19:55:28 +0800
Browse Files
do cuxiao new user coupon feature
6c8849ff

by hf
2015-11-26 19:54:55 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into java-api
1fd2ac19

by Rock Zhang
2015-11-26 19:54:30 +0800
Browse Files
do cuxiao new user coupon feature
817b2419

by hf
2015-11-26 19:53:18 +0800
Browse Files
do cuxiao new user coupon feature
dab4c4e9

by hf
2015-11-26 19:50:34 +0800
Browse Files
修复地址有关接口，修复意见反馈有关bug
d9881050

by Rock Zhang
2015-11-26 19:48:32 +0800
Browse Files
do cuxiao new user coupon feature coupon/hf
e7af9f29

by hf
2015-11-26 19:45:13 +0800
Browse Files
do cuxiao new user coupon feature coupon/hf
fae07430

by hf
2015-11-26 19:43:08 +0800
Browse Files
do cuxiao new user coupon feature
bedf5556

by hf
2015-11-26 19:39:07 +0800
Browse Files
do cuxiao new user coupon feature
475b9a00

by hf
2015-11-26 19:38:22 +0800
Browse Files
do cuxiao new user coupon feature
35721057

by hf
2015-11-26 19:37:34 +0800
Browse Files
do cuxiao new user coupon feature
3b41deda

by hf
2015-11-26 19:35:24 +0800
Browse Files
do cuxiao new user coupon feature
bffb4d3a

by hf
2015-11-26 19:34:13 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into java-api
0472c099

by Rock Zhang
2015-11-26 19:29:49 +0800
Browse Files
do cuxiao new user coupon feature
4523d22b

by hf
2015-11-26 19:25:00 +0800
Browse Files
do cuxiao new user coupon feature
07359870

by hf
2015-11-26 19:10:06 +0800
Browse Directory »
Merge branch 'test' of http://git.dev.yoho.cn/web/yohobuy into test
1ec902b4

by yangyang
2015-11-26 18:41:48 +0800
Browse Files
修改订单status判断。
8ef3e1c0

by yangyang
2015-11-26 18:41:30 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
022ba4c7

by Lynnic
2015-11-26 17:43:53 +0800
Browse Directory »
update
d2d9b667

by Lynnic
2015-11-26 17:42:35 +0800
Browse Files
删除调试信息
a6e81f3a

by ccbikai
2015-11-26 17:29:48 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
891ca78d

by ccbikai
2015-11-26 17:29:02 +0800
Browse Directory »
地址管理优化
c5ed8d41

by ccbikai
2015-11-26 17:28:56 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0280c0e0

by uedxwg
2015-11-26 17:02:31 +0800
Browse Directory »
update
3ebe35a4

by uedxwg
2015-11-26 17:02:08 +0800
Browse Directory »
更新到最新的js
98c5c52f

by Rock Zhang
2015-11-26 16:29:03 +0800
Browse Files
Merge branch 'java-api' into test ...
bf18299b
```
Conflicts:
	library/Api/Yohobuy.php
	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by Rock Zhang
2015-11-26 16:24:38 +0800
Browse Files
去除一些定死的参数
7034d3f5

by Rock Zhang
2015-11-26 16:17:06 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into java-api ...
dce6b523
```
Conflicts:
	library/Api/Yohobuy.php
	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by Rock Zhang
2015-11-26 16:14:50 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
835c3b0e

by Rock Zhang
2015-11-26 16:01:47 +0800
Browse Files
去除个人中心模块各页面的顶部变色
bbeeb711

by Rock Zhang
2015-11-26 16:01:43 +0800
Browse Files
修复冲突
86e384be

by yangyang
2015-11-26 16:00:35 +0800
Browse Files
修复会员等级不能正确显示vip3升级进度的bug
0828b5fc

by yangyang
2015-11-26 15:54:34 +0800
Browse Files