fe / yohobuy-portal-fe · Commits

20 Apr, 2016

3 commits

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
8ed83cf0

by 陶雨
2016-04-20 10:24:49 +0800
Browse Files
资源内容修复多个ul会报错的情况
fe2f9097

by 陶雨
2016-04-20 10:24:35 +0800
Browse Files
资源内容修改部分图片可拖拽排序
37095537

by 陶雨
2016-04-20 09:59:51 +0800
Browse Files

19 Apr, 2016

15 commits

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
3e55305e

by 姜敏
2016-04-19 18:50:52 +0800
Browse Files
图片上传bug（判断图片名称是否符合标准）
e10a9a14

by 姜敏
2016-04-19 18:50:37 +0800
Browse Files
店铺装修按钮颜色
0a1c9680

by dongjunjie
2016-04-19 18:02:06 +0800
Browse Files
drag2优化
88009559

by dongjunjie
2016-04-19 17:33:32 +0800
Browse Files
drag2
560bb550

by dongjunjie
2016-04-19 17:10:29 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
1f62add9

by dongjunjie
2016-04-19 16:38:42 +0800
Browse Files
拖拽控件2
b3d8c8f0

by dongjunjie
2016-04-19 16:37:50 +0800
Browse Files
资源内容修改部分图片可拖拽排序
94691ac8

by 陶雨
2016-04-19 16:00:26 +0800
Browse Files
Merge branch 'develop' into release/1.6
16ad7fb0

by weiqingting
2016-04-19 10:29:20 +0800
Browse Files
资源——发卷
b74a7c0e

by weiqingting
2016-04-19 10:28:48 +0800
Browse Files
解决冲突
b97d08a0

by 姜敏
2016-04-19 10:23:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
128ac2e6
```
# Conflicts:
#	client/js/sourceManage/resourceContentManage.js
```
by 姜敏
2016-04-19 10:19:41 +0800
Browse Files
尺码测量bug
3024b6f5

by 姜敏
2016-04-19 10:16:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
844abb04

by 陶雨
2016-04-19 10:03:53 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
8629233a
```
Conflicts:
	client/js/sourceManage/resourceContentManage.js
```
by 陶雨
2016-04-19 10:03:33 +0800
Browse Files

18 Apr, 2016

15 commits

销售类目页面
9a77f418

by dongjunjie
2016-04-18 18:31:57 +0800
Browse Files
销售类目物理目录校验bug
dad69152

by dongjunjie
2016-04-18 18:15:12 +0800
Browse Files
销售类目优化
7f3ae9c0

by dongjunjie
2016-04-18 17:44:30 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
36c2ba6e

by 姜敏
2016-04-18 17:25:00 +0800
Browse Files
尺码测量bug
3948f8a4

by 姜敏
2016-04-18 17:24:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
beb5c5f6
```
Conflicts:
	client/js/sourceManage/resourceContentManage.js
```
by 陶雨
2016-04-18 17:22:06 +0800
Browse Files
资源内容改用edit2
ac9be3a9

by 陶雨
2016-04-18 17:17:48 +0800
Browse Files
权限验证
71bd6a5c

by weiqingting
2016-04-18 16:12:22 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
dbb61972

by weiqingting
2016-04-18 14:33:09 +0800
Browse Files
添加对菜单的权限验证
546a85d5

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

by 姜敏
2016-04-18 13:59:27 +0800
Browse Files
资源位-领券码验证
7b53b1b0

by 姜敏
2016-04-18 13:58:58 +0800
Browse Files
店铺装修路由
c8046297

by dongjunjie
2016-04-18 11:48:07 +0800
Browse Files
销售类目优化
c24af7ad

by dongjunjie
2016-04-18 11:32:48 +0800
Browse Files
店铺装修路由
a6f935dd

by dongjunjie
2016-04-18 09:38:20 +0800
Browse Files

16 Apr, 2016

2 commits

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

by 姜敏
2016-04-16 15:59:48 +0800
Browse Files
修复bug（图片上传过滤，勾选无需测量）
a7532651

by 姜敏
2016-04-16 15:59:34 +0800
Browse Files

15 Apr, 2016

5 commits

销售类目bug
6ef2cf76

by dongjunjie
2016-04-15 18:21:37 +0800
Browse Files
修改商品图片库
c4072f8f

by 陶雨
2016-04-15 17:26:52 +0800
Browse Files
Merge branch 'develop' into release/1.6
517946f9

by weiqingting
2016-04-15 17:23:48 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
bb6fdffa

by 陶雨
2016-04-15 17:20:24 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
c08afc93
```
Conflicts:
	client/js/sourceManage/resourceContentManage.js
	server/config/common.js
```
by 陶雨
2016-04-15 17:20:07 +0800
Browse Files