fe / yohobuy-portal-fe · Commits

13 Apr, 2016

1 commit

yohoserach接口路径以及添加文章界面的缩略图
ba8821d8

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

12 Apr, 2016

39 commits

提交
6c522b45

by weiqingting
2016-04-12 19:32:18 +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
Merge branch 'release/1.6' into develop ...
be522362
```
# Conflicts:
#	server/interface/salecategory.js
#	server/stub/config/login.js
#	server/stub/service/upload.js
#	server/views/pages/salecategory/index.html
```
by weiqingting
2016-04-12 18:03:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
0e283edf

by weiqingting
2016-04-12 17:58:59 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
2838076e

by liuyue
2016-04-12 17:58:50 +0800
Browse Files
销售类目
e1f37b35

by liuyue
2016-04-12 17:58:41 +0800
Browse Files
提交
78eeda1a

by weiqingting
2016-04-12 17:58:36 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
88b1ebf8

by weiqingting
2016-04-12 17:38:47 +0800
Browse Files
factoryCode
3e9f3f76

by weiqingting
2016-04-12 17:38:23 +0800
Browse Files
试穿信息--下拉尺码
2a860e54

by 姜敏
2016-04-12 17:10:11 +0800
Browse Files
提交
b4d5235c

by weiqingting
2016-04-12 16:57:01 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
21a13952

by 姜敏
2016-04-12 16:31:34 +0800
Browse Files
添加商品/商品组--搜索以及界面修改
34b4ef85

by 姜敏
2016-04-12 16:31:23 +0800
Browse Files
提交
4aaec629

by weiqingting
2016-04-12 16:26:15 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
dbe07ecf

by 陶雨
2016-04-12 16:23:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
4c9a8751
```
Conflicts:
	server/views/pages/guang/contentEdit.html
```
by 陶雨
2016-04-12 16:22:59 +0800
Browse Files
提交
db4dab1c

by weiqingting
2016-04-12 16:21:05 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
d45255e2

by weiqingting
2016-04-12 16:01:08 +0800
Browse Files
提交
091a4d5d

by weiqingting
2016-04-12 16:00:34 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
15a53928
```
Conflicts:
	server/views/pages/guang/contentEdit.html
```
by 陶雨
2016-04-12 15:56:33 +0800
Browse Files
提交
af979aff

by weiqingting
2016-04-12 15:43:31 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
f3312de4
```
# Conflicts:
#	client/js/sourceManage/resourceContentManage.js
```
by weiqingting
2016-04-12 15:34:38 +0800
Browse Files
提交
5d8bb5f0

by weiqingting
2016-04-12 15:33:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
108033e2
```
Conflicts:
	server/views/pages/guang/contentEdit.html
```
by 陶雨
2016-04-12 15:30:11 +0800
Browse Files
资源内容管理展示
fe8e95e1

by 陶雨
2016-04-12 15:28:14 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
7f86d327

by weiqingting
2016-04-12 15:21:51 +0800
Browse Files
提交
10819452

by weiqingting
2016-04-12 15:21:27 +0800
Browse Files
拖拉
5778ad00

by dongjunjie
2016-04-12 15:07:08 +0800
Browse Files
退拽
3cd3c60c

by weiqingting
2016-04-12 14:56:05 +0800
Browse Files
drag拖拉控件
b13fd3e6

by dongjunjie
2016-04-12 14:52:08 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
9a73a3cc

by weiqingting
2016-04-12 14:35:56 +0800
Browse Files
提交
b00ea9b7

by weiqingting
2016-04-12 14:34:37 +0800
Browse Files