fe / yohobuy-portal-fe2 · Commits

07 Nov, 2016

9 commits

Merge branch 'dev_vedio' into test5.2 ...
14e71578
```
网销 视频
# Conflicts:
#	code/index.js
```
by ZhongW
2016-11-07 16:16:16 +0800
Browse Files
no message
aa8281c2

by ZhongW
2016-11-07 16:12:50 +0800
Browse Files
Merge branch 'dev_vedio' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into dev_vedio
8c25e70e

by ZhongW
2016-11-07 15:45:06 +0800
Browse Files
Merge remote-tracking branch 'origin/dev_vedio' into dev_vedio
3a62f17c

by 梁志锋
2016-11-07 15:27:44 +0800
Browse Files
富文本编辑器支持视频
a45bf0b7

by 梁志锋
2016-11-07 15:26:52 +0800
Browse Files
no message
6fe5a77d

by ZhongW
2016-11-07 14:58:44 +0800
Browse Files
Merge branch 'dev5.2' into test5.2
bfc3612c

by 马力
2016-11-07 14:17:53 +0800
Browse Files
新品楼层
148a6dbd

by wangwei
2016-11-07 14:17:00 +0800
Browse Files
组件增加上传视频的功能
aa3ee1ef

by ZhongW
2016-11-07 09:38:41 +0800
Browse Files

04 Nov, 2016

5 commits

Merge branch 'dev5.2' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into dev5.2
ab10873a

by liqingzhong
2016-11-04 15:24:50 +0800
Browse Files
增加 sale-1t-1l-4r 资源位
2ed6e3bd

by liqingzhong
2016-11-04 15:23:16 +0800
Browse Files
视频管理
a8346942

by ZhongW
2016-11-04 13:56:30 +0800
Browse Files
Merge branch 'dev_vedio' into test5.2
0d239f06

by ZhongW
2016-11-04 09:43:33 +0800
Browse Files
视频管理
7b6b8463

by ZhongW
2016-11-04 09:43:10 +0800
Browse Files

03 Nov, 2016

13 commits

富文本编辑器支持视频
83119df2

by 梁志锋
2016-11-03 19:26:28 +0800
Browse Files
Merge branch 'dev_vedio' into test5.2
579a4ffb

by ZhongW
2016-11-03 16:56:46 +0800
Browse Files
富文本编辑器支持视频
0e8a086b

by 梁志锋
2016-11-03 16:53:00 +0800
Browse Files
删除编译后的问题
782a8654

by 马力
2016-11-03 15:04:57 +0800
Browse Files
Merge branch 'master' into dev5.2
068ebab6

by 马力
2016-11-03 15:00:27 +0800
Browse Files
build
034b1dac

by xuhongyun
2016-11-03 11:36:05 +0800
Browse Files
Merge branch 'hotfix_预上架时间修复' into grey
e7ae60b4

by 马力
2016-11-03 11:19:40 +0800
Browse Files
网销顺序调整问题修复
45e63629

by lijian
2016-11-03 11:16:48 +0800
Browse Files
5.2楼层
cd33fd7a

by wangwei
2016-11-03 11:08:50 +0800
Browse Files
Merge branch 'dev5.2' into test5.2
a391b8a1

by 马力
2016-11-03 11:08:21 +0800
Browse Files
build
bd09c7f2

by xuhongyun
2016-11-03 10:14:02 +0800
Browse Files
待上架列表只支持查询待上架状态的
a210c23d

by 马力
2016-11-03 09:57:49 +0800
Browse Files
Merge branch 'dev_vedio' into test5.2
91db2929

by 马力
2016-11-03 09:49:37 +0800
Browse Files

02 Nov, 2016

7 commits

Build project
8412847a

by xuhongyun
2016-11-02 21:51:59 +0800
Browse Files
Merge branch 'hotfix_单品日' into grey
f57ca9fe

by xuhongyun
2016-11-02 21:46:59 +0800
Browse Files
Merge branch 'hotfix-店铺收藏加属性' into grey
ce94f3ce

by xuhongyun
2016-11-02 21:46:38 +0800
Browse Files
build
44cd0bd5

by xuhongyun
2016-11-02 19:54:58 +0800
Browse Files
富文本编辑器支持视频
5d5667f4

by 梁志锋
2016-11-02 19:17:40 +0800
Browse Files
预上架时间bug修复
4769ec57

by lijian
2016-11-02 18:32:10 +0800
Browse Files
Merge branch 'dev_图片跳转网销链接' into grey
8db3ec99

by 马力
2016-11-02 16:53:15 +0800
Browse Files

01 Nov, 2016

6 commits

富文本编辑支持视频
340b3ed2

by 梁志锋
2016-11-01 17:35:59 +0800
Browse Files
Merge branch 'dev5.2' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into dev5.2 ...
7b97fb51
```
# Conflicts:
#	code/apps/resource/views/__partail/taoyu.html
```
by wangwei
2016-11-01 13:28:11 +0800
Browse Files
好店推荐
43349966

by wangwei
2016-11-01 13:25:19 +0800
Browse Files
Merge branch 'hotfix-店铺收藏加属性' into test5.2
c00c2fcd

by 马力
2016-11-01 10:13:40 +0800
Browse Files
Merge branch 'hotfix_单品日' into test5.2
9ec6a035

by 马力
2016-11-01 10:13:08 +0800
Browse Files
加频道
a191afa0

by chenchao
2016-11-01 10:03:10 +0800
Browse Files