fe / yohobuy-portal-fe2 · Commits

26 Sep, 2016

2 commits

Merge branch 'dev_compatible' into test
88ef6000

by 马力
2016-09-26 10:32:42 +0800
Browse Files
数据兼容
6424b8b9

by lijian
2016-09-26 10:31:51 +0800
Browse Files

22 Sep, 2016

5 commits

Merge branch 'dev_2.2' into test
330e0fad

by xuhongyun
2016-09-22 21:23:20 +0800
Browse Files
超时时长设置为2小时
49a3df00

by xuhongyun
2016-09-22 21:21:17 +0800
Browse Files
Merge branch 'dev_2.2' into test
dd522acb

by xuhongyun
2016-09-22 19:23:18 +0800
Browse Files
Merge branch 'dev_2.2' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into dev_2.2
e77883a7

by ZhongW
2016-09-22 16:31:56 +0800
Browse Files
变价限制文案修改
066e0a02

by ZhongW
2016-09-22 16:31:45 +0800
Browse Files

21 Sep, 2016

12 commits

物理类目中，没有性别 ...
449d292e
```
物理分类的图片没有地方可以维护
```
by 马力
2016-09-21 19:35:26 +0800
Browse Files
Merge branch 'dev_2.2' into test
20e68bde

by xuhongyun
2016-09-21 19:11:32 +0800
Browse Files
fix build error
7db062dd

by xuhongyun
2016-09-21 19:11:22 +0800
Browse Files
品类可以维护性别字段
61a0ec2c

by 马力
2016-09-21 18:06:48 +0800
Browse Files
Merge branch 'dev_2.2' into test
6c0d00dd

by xuhongyun
2016-09-21 17:26:13 +0800
Browse Files
Merge branch 'dev_2.2' of git.yoho.cn:fe/yohobuy-portal-fe2 into dev_2.2 ...
cde28077
```
# By Zhongw
# Via Zhongw
* 'dev_2.2' of git.yoho.cn:fe/yohobuy-portal-fe2:
  代销变价隐藏学生价
```
by linlong
2016-09-21 17:15:18 +0800
Browse Files
update
004d5d14

by linlong
2016-09-21 17:14:58 +0800
Browse Files
品类关联尺码，不允许一、二级分类关联尺码(先从页面禁用)
c832e1bd

by 马力
2016-09-21 17:12:21 +0800
Browse Files
代销变价隐藏学生价
66090d55

by ZhongW
2016-09-21 17:08:04 +0800
Browse Files
物理类目编辑时，不允许修改所属分类
4de507c5

by 马力
2016-09-21 16:28:40 +0800
Browse Files
Merge branch 'dev_2.2' into test
e5b372f9

by 马力
2016-09-21 10:11:19 +0800
Browse Files
需要选择分页条数
50de3d91

by ZhongW
2016-09-21 09:50:33 +0800
Browse Files

20 Sep, 2016

11 commits

no message
b081662a

by lijian
2016-09-20 18:27:42 +0800
Browse Files
尺码测量属性
4d781154

by lijian
2016-09-20 18:15:04 +0800
Browse Files
Merge branch 'dev_2.2' into test
c2a9369a

by 马力
2016-09-20 16:27:24 +0800
Browse Files
学生价删掉
258bf593

by ZhongW
2016-09-20 16:16:22 +0800
Browse Files
降价幅度添加%
e5290704

by ZhongW
2016-09-20 15:11:02 +0800
Browse Files
Merge branch 'dev_2.2' into test
4bea1127

by 马力
2016-09-20 14:41:49 +0800
Browse Files
Merge branch 'dev_2.2' of git.yoho.cn:fe/yohobuy-portal-fe2 into dev_2.2
1df30f8c

by linlong
2016-09-20 11:00:09 +0800
Browse Files
SKU重叠
bbaa3044

by linlong
2016-09-20 10:48:41 +0800
Browse Files
Merge branch 'dev_2.2' into test
bd9b8705

by ping
2016-09-20 10:16:46 +0800
Browse Files
Merge branch 'dev_2.2' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into dev_2.2
8b051bef

by ZhongW
2016-09-20 10:11:15 +0800
Browse Files
bug
5996a7d6

by ZhongW
2016-09-20 10:11:02 +0800
Browse Files

19 Sep, 2016

10 commits

Merge branch 'dev_2.2' into test
fb7090df

by 马力
2016-09-19 19:08:29 +0800
Browse Files
Merge branch 'dev_2.2' of git.yoho.cn:fe/yohobuy-portal-fe2 into dev_2.2 ...
851b5136
```
# By Zhongw
# Via Zhongw
* 'dev_2.2' of git.yoho.cn:fe/yohobuy-portal-fe2:
  文案修改
```
by linlong
2016-09-19 18:26:33 +0800
Browse Files
网销全部保存bug
76791ad5

by linlong
2016-09-19 18:26:05 +0800
Browse Files
Merge branch 'dev_2.2' into test
3e9c3d7f

by xuhongyun
2016-09-19 15:30:22 +0800
Browse Files
Merge branch 'dev_2.2' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into dev_2.2
e3e2c9d0

by ZhongW
2016-09-19 15:18:54 +0800
Browse Files
文案修改
443d3050

by ZhongW
2016-09-19 15:18:45 +0800
Browse Files
品牌排序默认值0
ea7d9c89

by linlong
2016-09-19 14:45:26 +0800
Browse Files
build project
10039879

by xuhongyun
2016-09-19 13:58:36 +0800
Browse Files
Merge branch 'test' into grey ...
7fa1811e
```
# Conflicts:
#	code/static/js.jquery/common/upload.js
```
by xuhongyun
2016-09-19 13:57:41 +0800
Browse Files
Merge branch 'dev_2.2' into test
0395f1d6

by xuhongyun
2016-09-19 13:55:40 +0800
Browse Files