fe / YOHOBUYWAP · Commits

13 Nov, 2015

21 commits

changed the name of conflicted function
7ccb30d2

by Lynnic
2015-11-13 15:37:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e5569a46

by Lynnic
2015-11-13 14:50:09 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b4b964e5

by ccbikai
2015-11-13 14:35:33 +0800
Browse Files
修改地址页面样式
6f680827

by ccbikai
2015-11-13 14:35:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
7a6895eb

by uedxwg
2015-11-13 14:23:11 +0800
Browse Files
'hotrank'
8413e205

by uedxwg
2015-11-13 14:22:31 +0800
Browse Files
update
a7552b8a

by lynnic
2015-11-13 13:40:22 +0800
Browse Files
增
9ce2bf29

by ccbikai
2015-11-13 13:35:07 +0800
Browse Files
merge code
0ff1e353

by ccbikai
2015-11-13 13:30:37 +0800
Browse Files
地址模板修改
88ef01d3

by ccbikai
2015-11-13 13:29:45 +0800
Browse Files
merge master css js code
cdba8278

by hf
2015-11-13 13:24:46 +0800
Browse Files
merge master css js code
91cebbc6

by hf
2015-11-13 13:24:01 +0800
Browse Files
地址管理增加数据
35dbe8bc

by ccbikai
2015-11-13 13:22:34 +0800
Browse Files
product detail
f735917c

by lynnic
2015-11-13 13:19:56 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
bfaf6f7d

by ccbikai
2015-11-13 11:47:23 +0800
Browse Files
地址管理页面样式
ddb8634a

by ccbikai
2015-11-13 11:47:18 +0800
Browse Files
merge master css js code
da2dd89e

by hf
2015-11-13 11:15:06 +0800
Browse Files
merge master css js code
e677bad0

by hf
2015-11-13 10:52:10 +0800
Browse Files
do merge master code
cef09262

by hf
2015-11-13 10:51:02 +0800
Browse Files
个人中心首页完善
1483b137

by ccbikai
2015-11-13 10:18:43 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
2b3507b2

by ccbikai
2015-11-13 09:39:53 +0800
Browse Files

12 Nov, 2015

19 commits

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

by uedxwg
2015-11-12 18:40:33 +0800
Browse Files
'hotrank'
9c12951e

by uedxwg
2015-11-12 18:39:49 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
a7a36134
```
Conflicts:
	framework
```
by Rock Zhang
2015-11-12 18:30:47 +0800
Browse Files
完成个人中心部分功能
d336ffb7

by Rock Zhang
2015-11-12 18:30:23 +0800
Browse Files
modify to search goods list style
f1ec9574

by hf
2015-11-12 18:18:41 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
47f54e6c
```
Conflicts:
	static/js/me/entry.js
	static/sass/me/_index.scss
	template/m.yohobuy.com/partials/layout/use.phtml
```
by lore-w
2015-11-12 18:16:56 +0800
Browse Files
modify to search goods list style
afe58b17

by hf
2015-11-12 18:12:58 +0800
Browse Files
Merge remote-tracking branch 'origin/hotfix'
32827f6a

by hf
2015-11-12 18:12:27 +0800
Browse Files
收藏、意见反馈
1ba211d6

by lore-w
2015-11-12 18:11:25 +0800
Browse Files
取消搜索不 focus
80adb413

by ccbikai
2015-11-12 18:09:40 +0800
Browse Files
modify to search goods list style
76c51067

by hf
2015-11-12 18:01:57 +0800
Browse Files
modify to search goods list style
ebf90d5f

by hf
2015-11-12 18:01:37 +0800
Browse Files
Merge remote-tracking branch 'origin/hotfix'
74c6939a

by hf
2015-11-12 18:00:27 +0800
Browse Files
sale 页面筛选按钮
4be2273d

by ccbikai
2015-11-12 17:59:46 +0800
Browse Files
个人中西会员等级管理增加底部pageFooter
a72e1a2a

by yangyang
2015-11-12 17:58:02 +0800
Browse Files
Merge remote-tracking branch 'origin/hotfix'
d874739a

by hf
2015-11-12 17:57:14 +0800
Browse Files
取消搜索按钮优化
b169115f

by ccbikai
2015-11-12 17:53:46 +0800
Browse Files
modify to search goods list style
e7c80051

by hf
2015-11-12 17:42:00 +0800
Browse Files
modify to search goods list style
3ce12a40

by hf
2015-11-12 17:40:16 +0800
Browse Files