fe / yohobuy-portal-fe · Commits

13 Apr, 2016

28 commits

提交
bf405578

by weiqingting
2016-04-13 19:09:50 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
fc34a26b

by weiqingting
2016-04-13 19:02:59 +0800
Browse Files
提交
f8576ec0

by weiqingting
2016-04-13 19:02:41 +0800
Browse Files
修改推荐品牌显示
c625c0d7

by 陶雨
2016-04-13 19:00:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
ac2c5ba0

by 陶雨
2016-04-13 18:43:03 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
b1f37642
```
Conflicts:
	client/js/sourceManage/resourceContentManage.js
```
by 陶雨
2016-04-13 18:42:53 +0800
Browse Files
逛拖拽
33ed9a58

by dongjunjie
2016-04-13 18:35:07 +0800
Browse Files
逛-内容
314645c9

by weiqingting
2016-04-13 16:18:04 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
1131c2b4

by weiqingting
2016-04-13 15:58:23 +0800
Browse Files
提交
86155573

by weiqingting
2016-04-13 15:58:02 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
845673fb
```
Conflicts:
	client/js/sourceManage/resourceContentManage.js
```
by 陶雨
2016-04-13 14:20:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
9d957587
```
Conflicts:
	server/views/pages/guang/contentEdit.html
```
by 陶雨
2016-04-13 14:18:53 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
77712315

by 姜敏
2016-04-13 14:10:47 +0800
Browse Files
资源位-添加图标和楼层
7980d8d8

by 姜敏
2016-04-13 14:10:27 +0800
Browse Files
品牌索引
321577f0

by liuyue
2016-04-13 13:18:54 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
d22afe5b

by weiqingting
2016-04-13 11:00:59 +0800
Browse Files
tj
7814c592

by weiqingting
2016-04-13 11:00:45 +0800
Browse Files
缩略图恢复
c8b60db7

by 姜敏
2016-04-13 10:59:03 +0800
Browse Files
提交
72740ac2

by weiqingting
2016-04-13 10:51:05 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
5357a504

by weiqingting
2016-04-13 10:36:28 +0800
Browse Files
提交
46119142

by weiqingting
2016-04-13 10:36:15 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
2059d799
```
Conflicts:
	server/views/pages/guang/contentEdit.html
```
by 陶雨
2016-04-13 10:35:10 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
9870f24f

by 陶雨
2016-04-13 10:29:44 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
fcb4c549
```
Conflicts:
	server/views/pages/guang/contentEdit.html
```
by 陶雨
2016-04-13 10:29:35 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
82d73a79

by weiqingting
2016-04-13 10:25:08 +0800
Browse Files
提交
444c3323

by weiqingting
2016-04-13 10:24:45 +0800
Browse Files
yohoserach接口路径以及添加文章界面的缩略图
ba8821d8

by 姜敏
2016-04-13 10:13:39 +0800
Browse Files
提交
c37b51ca

by weiqingting
2016-04-13 09:53:04 +0800
Browse Files

12 Apr, 2016

12 commits

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
c31a5615

by 陶雨
2016-04-12 19:32:27 +0800
Browse Files
提交
6c522b45

by weiqingting
2016-04-12 19:32:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
cc586a83

by 陶雨
2016-04-12 19:25:03 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
a053ee9b
```
Conflicts:
	server/views/pages/guang/contentEdit.html
```
by 陶雨
2016-04-12 19:22:58 +0800
Browse Files
提交
f6783793

by weiqingting
2016-04-12 19:22:47 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
b8b73e99

by weiqingting
2016-04-12 18:51:23 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
c38bddbc
```
# Conflicts:
#	server/config/common.js
```
by weiqingting
2016-04-12 18:51:00 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
ad75f4b7

by 陶雨
2016-04-12 18:50:07 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
ecc952cd
```
Conflicts:
	server/views/pages/guang/contentEdit.html
```
by 陶雨
2016-04-12 18:49:56 +0800
Browse Files
修改新建对象
1011af8e

by weiqingting
2016-04-12 18:49:52 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
f687758a
```
Conflicts:
	client/js/common/dropDown.js
	server/config/common.js
```
by 王钱钧
2016-04-12 18:08:32 +0800
Browse Files
添加货到付款功能代码
0bbbc1de

by 王钱钧
2016-04-12 18:06:44 +0800
Browse Files