fe / yohobuy-portal-fe2 · Commits

26 Sep, 2016

16 commits

Merge branch 'dev_compatible' into test
1192b6a6

by 马力
2016-09-26 19:41:58 +0800
Browse Files
http://jira.yoho.cn:8888/browse/YBW-7970 【平台化2.3】【品类管理尺码】编辑品类关联的尺码，不修改，直接保存，保存失败
fb1d8f2c

by 马力
2016-09-26 19:41:27 +0800
Browse Files
http://jira.yoho.cn:8888/browse/YBW-7970 【平台化2.3】【品类管理尺码】编辑品类关联的尺码，不修改，直接保存，保存失败
88e3a002

by 马力
2016-09-26 19:39:13 +0800
Browse Files
Merge branch 'dev_compatible' into test
0b9b4357

by 马力
2016-09-26 18:29:42 +0800
Browse Files
物理品类的图标保存功能
5f6c4c64

by 马力
2016-09-26 18:28:53 +0800
Browse Files
Merge branch 'local_dev' into test
7fa07ca8

by xuhongyun
2016-09-26 17:39:17 +0800
Browse Files
fix bug
d7fc4159

by xuhongyun
2016-09-26 17:39:10 +0800
Browse Files
Merge branch 'local_dev' into test
f13fdb06

by xuhongyun
2016-09-26 17:34:47 +0800
Browse Files
fix bug
c0031e4b

by xuhongyun
2016-09-26 17:34:08 +0800
Browse Files
Merge branch 'dev_compatible' into test
23a5680b

by 马力
2016-09-26 17:20:46 +0800
Browse Files
no message
95df5e3a

by lijian
2016-09-26 17:14:54 +0800
Browse Files
Merge branch 'dev_compatible' into test
1762a2ee

by 马力
2016-09-26 15:14:23 +0800
Browse Files
修改品类尺码关联时，如果有很多行序值相同时，只需要报一次序值不可重复
094bc815

by 马力
2016-09-26 15:08:37 +0800
Browse Files
Merge branch 'local_dev' into test ...
77ad1ab9
```
# Conflicts:
#	code/index.js
```
by xuhongyun
2016-09-26 11:42:29 +0800
Browse Files
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

24 Sep, 2016

1 commit

修改会话超时时长为2小时
88b2f8ee

by xuhongyun
2016-09-24 18:40:47 +0800
Browse Files

22 Sep, 2016

8 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
build project
332b0e19

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

by xuhongyun
2016-09-22 19:23:18 +0800
Browse Files
修改前台bug isNew==0 改为 isNew===0
b348e5cb

by pangjie
2016-09-22 18:44:32 +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
build project
74d546a6

by xuhongyun
2016-09-22 10:05:41 +0800
Browse Files

21 Sep, 2016

15 commits

物理类目中，没有性别 ...
449d292e
```
物理分类的图片没有地方可以维护
```
by 马力
2016-09-21 19:35:26 +0800
Browse Files
Merge branch 'dev-split-db-0913' into grey
ed77afc8

by pangjie
2016-09-21 19:25:17 +0800
Browse Files
老的优惠券不允许编辑优惠券数量
3b18010c

by pangjie
2016-09-21 19:24:25 +0800
Browse Files
build project
5f6a7d45

by xuhongyun
2016-09-21 19:15:39 +0800
Browse Files
Merge branch 'test' into grey
e6ff7f66

by xuhongyun
2016-09-21 19:14:38 +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 'test' into grey
fdf4619b

by 马力
2016-09-21 17:41:43 +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