fe / yohobuy-portal-fe · Commits

27 Apr, 2016

1 commit

template2
532f78ac

by weiqingting
2016-04-27 10:43:33 +0800
Browse Files

25 Apr, 2016

10 commits

优化 template2 layout
27a517a9

by weiqingting
2016-04-25 17:33:12 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
08a2fb28

by weiqingting
2016-04-25 14:35:57 +0800
Browse Files
图片后缀
c9fb0bf2

by weiqingting
2016-04-25 14:35:03 +0800
Browse Files
edit2图片上传bug
176830e6

by 姜敏
2016-04-25 14:29:57 +0800
Browse Files
git 提交
dbfbf6cb

by weiqingting
2016-04-25 13:34:51 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
d8645b34

by weiqingting
2016-04-25 12:38:47 +0800
Browse Files
逛提交图片
7a8195ea

by weiqingting
2016-04-25 12:38:32 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
c0b34795

by 姜敏
2016-04-25 11:35:01 +0800
Browse Files
修复发券管理bug
3ae4a222

by 姜敏
2016-04-25 11:34:51 +0800
Browse Files
销售类目添加子节点父目录bug
ab47b87d

by dongjunjie
2016-04-25 11:28:38 +0800
Browse Files

22 Apr, 2016

8 commits

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

by 姜敏
2016-04-22 16:51:10 +0800
Browse Files
yohosearch 接口url中文转码
51b37fd8

by 姜敏
2016-04-22 16:50:08 +0800
Browse Files
Merge branch 'develop' into release/1.6
fccfa3ba

by weiqingting
2016-04-22 15:56:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
d55806f9

by weiqingting
2016-04-22 15:56:05 +0800
Browse Files
资源位--领券楼层领券码验证
54215a21

by 姜敏
2016-04-22 14:30:11 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
b1905e90

by 姜敏
2016-04-22 13:58:01 +0800
Browse Files
发券管理（基本完结）
bab67fb1

by 姜敏
2016-04-22 13:57:50 +0800
Browse Files
excel 下载
12e646c4

by weiqingting
2016-04-22 13:20:45 +0800
Browse Files

21 Apr, 2016

2 commits

yoho币
800422c3

by dongjunjie
2016-04-21 18:20:42 +0800
Browse Files
资源位-界面小bug修复
a5796579

by 姜敏
2016-04-21 16:06:45 +0800
Browse Files

20 Apr, 2016

4 commits

发券管理（初步）
b3c18755

by 姜敏
2016-04-20 11:54:45 +0800
Browse Files
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