fe / yohobuy-portal-fe · Commits

06 Apr, 2016

22 commits

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

by 姜敏
2016-04-06 14:42:47 +0800
Browse Files
图片上传（单张修改）
fd9fcd00

by 姜敏
2016-04-06 14:42:33 +0800
Browse Files
Merge branch 'release/1.6' into develop
17c2b634

by weiqingting
2016-04-06 14:16:31 +0800
Browse Files
提交
a8204ab5

by weiqingting
2016-04-06 14:07:36 +0800
Browse Files
提交
535dac06

by weiqingting
2016-04-06 13:48:41 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
6eae540a

by liuyue
2016-04-06 13:36:15 +0800
Browse Files
网销列表图片显示
10febb41

by liuyue
2016-04-06 13:36:02 +0800
Browse Files
灰色代理
d8de2b59

by weiqingting
2016-04-06 13:28:53 +0800
Browse Files
提交
8f04b8fe

by weiqingting
2016-04-06 11:48:48 +0800
Browse Files
批量shopId
0625ac4e

by weiqingting
2016-04-06 11:39:54 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
009b6901

by 姜敏
2016-04-06 11:24:59 +0800
Browse Files
图片批量上传（goodsimg）
3f86916c

by 姜敏
2016-04-06 11:24:49 +0800
Browse Files
Merge branch 'release/1.6' into develop ...
cc45ac8e
```
# Conflicts:
#	server/config/common.js
```
by weiqingting
2016-04-06 10:30:45 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6
ec0211a6

by weiqingting
2016-04-06 10:28:08 +0800
Browse Files
逛
0a7a89a5

by weiqingting
2016-04-06 10:27:52 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
48042e17

by 姜敏
2016-04-06 10:20:52 +0800
Browse Files
拍摄图片管理修改（根据图片初始名判断），以及界面优化
df325835

by 姜敏
2016-04-06 10:20:36 +0800
Browse Files
店铺装修初始化
b988e50f

by dongjunjie
2016-04-06 10:09:15 +0800
Browse Files
店铺装修bug
53f45c40

by dongjunjie
2016-04-06 10:01:39 +0800
Browse Files
按照库存排序
706c3121

by liuyue
2016-04-06 09:59:35 +0800
Browse Files
逛
449500e4

by weiqingting
2016-04-06 09:57:55 +0800
Browse Files
基础商品列表类目显示
37a213c8

by liuyue
2016-04-06 09:45:59 +0800
Browse Files

05 Apr, 2016

18 commits

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

by dongjunjie
2016-04-05 18:49:43 +0800
Browse Files
店铺装修改惹
2afae88b

by dongjunjie
2016-04-05 18:49:37 +0800
Browse Files
网销信息商品排序限定只能输入数字
5d0fe151

by 陶雨
2016-04-05 18:42:41 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
5ebf0d13

by 王钱钧
2016-04-05 18:10:02 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
36116c45

by 陶雨
2016-04-05 18:09:43 +0800
Browse Files
资源内容管理
9756afcf

by 陶雨
2016-04-05 18:09:28 +0800
Browse Files
添加逛 plus/star 分类功能代码
97aa51d4

by 王钱钧
2016-04-05 18:09:07 +0800
Browse Files
Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
5d02f0eb

by liuyue
2016-04-05 17:16:58 +0800
Browse Files
商品信息显示最小类目
893e5e5b

by liuyue
2016-04-05 17:16:49 +0800
Browse Files
Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6 ...
9e94cf84
```
# Conflicts:
#	server/config/common.js
```
by weiqingting
2016-04-05 16:48:36 +0800
Browse Files
批量
fb14f66e

by weiqingting
2016-04-05 16:47:47 +0800
Browse Files
批量修改
df7fb62f

by weiqingting
2016-04-05 16:46:46 +0800
Browse Files
列表参数isInfoMiss
55731e1a

by liuyue
2016-04-05 15:59:25 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
49478084

by 周奇琪
2016-04-05 15:46:34 +0800
Browse Files
Merge branch 'hotfix/fixed_gray_import' into develop
82a1821a

by 周奇琪
2016-04-05 15:42:32 +0800
Browse Files
修复上传文件失败的问题
6727519d

by 周奇琪
2016-04-05 15:42:06 +0800
Browse Files
按钮置灰代码
961a14e7

by weiqingting
2016-04-05 13:12:58 +0800
Browse Files
按钮指挥处理
e9cdd3a4

by weiqingting
2016-04-05 11:36:25 +0800
Browse Files