fe / yohobuy-portal-fe · Commits

01 Jun, 2016

4 commits

腾讯云 preview
b50919e5

by weiqingting
2016-06-01 10:35:26 +0800
Browse Files
Merge branch 'feature/yohobuy_portal_dev_v4.4_shops_20160527' into feature/feature_v4.5_20160525 ...
abfa9871
```
# Conflicts:
#	client/js/meterManage/tryModel.js
#	client/package.json
```
by weiqingting
2016-06-01 10:00:41 +0800
Browse Files
Merge branch 'yohobuy_portal_dev_v4.4_20160525' into feature/yohobuy_portal_dev_v4.4_shops_20160527
aee4cc24

by weiqingting
2016-06-01 09:55:43 +0800
Browse Files
端口修改为6379
7313b252

by weiqingting
2016-06-01 09:49:48 +0800
Browse Files

31 May, 2016

14 commits

pagejson 修改
acd70d52

by weiqingting
2016-05-31 18:23:29 +0800
Browse Files
灰度环境【亚马逊】4.4
260f744b

by weiqingting
2016-05-31 18:10:13 +0800
Browse Files
拍摄扶持
d0628be6

by dongjunjie
2016-05-31 17:31:56 +0800
Browse Files
样式优化
9ed67160

by dongjunjie
2016-05-31 17:06:54 +0800
Browse Files
添加活动删除功能
2fbdce8a

by weiqingting
2016-05-31 17:05:30 +0800
Browse Files
测试环境
b0ff6e8f

by weiqingting
2016-05-31 16:46:39 +0800
Browse Files
Merge branch 'yohobuy_portal_dev_v4.4_20160525' into feature/yohobuy_portal_dev_v4.4_shops_20160527
cc1b3335

by weiqingting
2016-05-31 16:38:03 +0800
Browse Files
基础商品 bug修改
81c516f0

by weiqingting
2016-05-31 16:36:53 +0800
Browse Files
商品属性 bug修改
aefaf19e

by weiqingting
2016-05-31 16:34:04 +0800
Browse Files
168 环境部署
7a145d5e

by weiqingting
2016-05-31 15:56:58 +0800
Browse Files
Merge branch 'feature/feature_v4.5_20160525' of http://git.yoho.cn/fe/yohobuy-po… ...
35199f4e
```
…rtal-fe into feature/feature_v4.5_20160525
```
by weiqingting
2016-05-31 15:35:12 +0800
Browse Files
网销整理
63429737

by weiqingting
2016-05-31 15:34:30 +0800
Browse Files
发券管理--复制功能
7b4ef318

by 姜敏
2016-05-31 12:28:07 +0800
Browse Files
copy
0c4c7709

by weiqingting
2016-05-31 10:46:59 +0800
Browse Files

30 May, 2016

9 commits

Merge branch 'feature/feature_v4.5_20160525' of http://git.yoho.cn/fe/yohobuy-po… ...
df46494f
```
…rtal-fe into feature/feature_v4.5_20160525
```
by weiqingting
2016-05-30 20:20:46 +0800
Browse Files
4.5 基础商品bug修复
e22ea013

by weiqingting
2016-05-30 20:20:36 +0800
Browse Files
店铺装修bug
0fc8670e

by dongjunjie
2016-05-30 20:04:58 +0800
Browse Files
代销变价支持3级联动类目查询
17efe995

by dongjunjie
2016-05-30 19:06:42 +0800
Browse Files
店铺装修
f7988f6c

by dongjunjie
2016-05-30 18:18:35 +0800
Browse Files
店铺装修bug
78c66d82

by dongjunjie
2016-05-30 18:11:32 +0800
Browse Files
反馈管理--固定回复内容列长度
fa39484d

by 姜敏
2016-05-30 17:37:53 +0800
Browse Files
店铺装修
9377be89

by dongjunjie
2016-05-30 15:18:53 +0800
Browse Files
拍摄模特管理添加默认状态
4c3b99fb

by weiqingting
2016-05-30 12:50:44 +0800
Browse Files

27 May, 2016

13 commits

提交顺便测试新git
50a5b7e4

by weiqingting
2016-05-27 19:14:03 +0800
Browse Files
Merge branch 'feature/feature_v4.5_20160525' of http://git.dev.yoho.cn/platform/… ...
e9962528
```
…yohobuy-portal-fe into feature/feature_v4.5_20160525
```
by weiqingting
2016-05-27 18:56:57 +0800
Browse Files
Merge branch 'yohobuy_portal_dev_v4.4_20160525' into feature/feature_v4.5_20160525
a7844bd3

by weiqingting
2016-05-27 18:09:21 +0800
Browse Files
资源位--图标个数显示问题
c424d5c8

by 姜敏
2016-05-27 18:07:20 +0800
Browse Files
添加package.json文件
8347b79a

by 陶雨
2016-05-27 17:38:32 +0800
Browse Files
资源管理添加根据id搜索
3c11d1a5

by 陶雨
2016-05-27 17:35:04 +0800
Browse Files
修复资源位内容弹窗跳转action为空的问题
a7801772

by 陶雨
2016-05-27 17:20:10 +0800
Browse Files
修复资源位内容弹窗跳转action为空的问题
4e0b1678

by 陶雨
2016-05-27 16:45:09 +0800
Browse Files
样式bug
cb4f27d2

by dongjunjie
2016-05-27 16:14:58 +0800
Browse Files
修改样式
6bd25b21

by 陶雨
2016-05-27 16:05:58 +0800
Browse Files
添加package.json
2e35bf44

by 陶雨
2016-05-27 15:47:02 +0800
Browse Files
解决合并代码的问题
30245d69

by 陶雨
2016-05-27 15:45:36 +0800
Browse Files
店铺装修
0cc6d9c6

by dongjunjie
2016-05-27 15:35:43 +0800
Browse Files