fe / yohobuy-portal-fe · Commits

17 May, 2016

6 commits

提交
8d6bc250

by weiqingting
2016-05-17 17:00:09 +0800
Browse Files
Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
5f51039e
```
…fe into release/qqtest

Conflicts:
	server/views/pages/basegoods/edit.html
```
by 陶雨
2016-05-17 16:44:34 +0800
Browse Files
basegoods/edit.html
c9ef9072

by 陶雨
2016-05-17 16:42:02 +0800
Browse Files
Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
8e15ecd4
```
…fe into release/qqtest
```
by weiqingting
2016-05-17 10:48:41 +0800
Browse Files
supplier回滚到5.5之前
3675af0f

by 陶雨
2016-05-17 09:53:38 +0800
Browse Files
supplier回滚到5.5之前
c7f69eeb

by 陶雨
2016-05-17 09:50:26 +0800
Browse Files

16 May, 2016

9 commits

预售库存修改
3b17cd25

by weiqingting
2016-05-16 21:23:07 +0800
Browse Files
提交
2a890c2d

by weiqingting
2016-05-16 20:16:24 +0800
Browse Files
逛资讯修改性别的bug
d07251f2

by 陶雨
2016-05-16 18:58:05 +0800
Browse Files
Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
bbebd061
```
…fe into release/qqtest
```
by 陶雨
2016-05-16 17:44:30 +0800
Browse Files
client/js/basegppds/edit.js回滚到4.8号
a1569e41

by 陶雨
2016-05-16 17:44:21 +0800
Browse Files
店铺装修提示文字有误
f6a8a21a

by dongjunjie
2016-05-16 17:35:10 +0800
Browse Files
Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
15c8bfb2
```
…fe into release/qqtest
```
by 陶雨
2016-05-16 17:18:12 +0800
Browse Files
资源内容预发布时间限制修改为不能重复
f5dad4bd

by 陶雨
2016-05-16 17:17:55 +0800
Browse Files
添加静态文件功能模块
ec1942f5

by 王钱钧
2016-05-16 13:44:24 +0800
Browse Files

13 May, 2016

4 commits

Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
93631c80
```
…fe into release/qqtest
```
by 陶雨
2016-05-13 18:09:33 +0800
Browse Files
资源位内容修改添加楼层弹窗标题
ae81c292

by 陶雨
2016-05-13 18:09:23 +0800
Browse Files
1、上架审核全部添加数量显示 ...
fdcd566e
```
2、供应商审核审核添加延时
```
by 陶雨
2016-05-13 17:53:21 +0800
Browse Files
【代销变价】设置了Yoho币的商品，不允许改价
dc6e3429

by dongjunjie
2016-05-13 17:02:42 +0800
Browse Files

12 May, 2016

15 commits

资源管理热门品类楼层样式修改
28aae5d2

by 陶雨
2016-05-12 18:58:05 +0800
Browse Files
资源管理热门品类楼层样式修改
5f25b6f1

by 陶雨
2016-05-12 18:47:05 +0800
Browse Files
Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
07273308
```
…fe into release/qqtest
```
by 陶雨
2016-05-12 18:28:36 +0800
Browse Files
资源管理样式修改，修改拖拽的bug
9237a318

by 陶雨
2016-05-12 18:28:25 +0800
Browse Files
修改错别字
4a7497e9

by dongjunjie
2016-05-12 16:14:34 +0800
Browse Files
专题管理修改编辑页商品池数据问题
8e04227d

by 陶雨
2016-05-12 16:09:34 +0800
Browse Files
Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
014b82a1
```
…fe into release/qqtest
```
by 陶雨
2016-05-12 15:47:19 +0800
Browse Files
资源位内容删除部分内容描述input required属性
afb9d2c6

by 陶雨
2016-05-12 15:47:09 +0800
Browse Files
网销，基础商品显示反Yoho币金额
13a3fb46

by dongjunjie
2016-05-12 15:22:44 +0800
Browse Files
Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
fb49dd57
```
…fe into release/qqtest
```
by 陶雨
2016-05-12 14:08:03 +0800
Browse Files
资源位内容修改热门品类楼层填充条件、url改为非必填
bb776376

by 陶雨
2016-05-12 14:07:51 +0800
Browse Files
yoho币影响其他页面
d7ce1d0b

by dongjunjie
2016-05-12 12:42:12 +0800
Browse Files
资源位内容修改热门品类楼层样式
1227ea23

by 陶雨
2016-05-12 11:46:55 +0800
Browse Files
Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
f60fc0bc
```
…fe into release/qqtest
```
by 陶雨
2016-05-12 11:40:58 +0800
Browse Files
资源位内容修改热门品类楼层样式
0e426e32

by 陶雨
2016-05-12 11:40:45 +0800
Browse Files

11 May, 2016

6 commits

Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
92b1949f
```
…fe into release/qqtest
```
by weiqingting
2016-05-11 18:37:42 +0800
Browse Files
防止重复提交
7040def6

by weiqingting
2016-05-11 18:37:18 +0800
Browse Files
Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-… ...
1c7309c0
```
…fe into release/qqtest
```
by 陶雨
2016-05-11 18:22:41 +0800
Browse Files
资源位内容修改table样式
2187165b

by 陶雨
2016-05-11 18:22:20 +0800
Browse Files
修复FireFox表格兼容小问题
98c57860

by dongjunjie
2016-05-11 18:14:40 +0800
Browse Files
yoho币导入
74dbefd6

by dongjunjie
2016-05-11 17:43:33 +0800
Browse Files