fe / yohobuy-portal-fe · Commits

08 Mar, 2016

13 commits

update
a8cbbf17

by ping
2016-03-08 18:52:45 +0800
Browse Files
修改基础商品规则模块bug， ...
4e582377
```
添加基础商品模块代码。
```
by 王钱钧
2016-03-08 18:43:05 +0800
Browse Files
解决冲突
8dcdfcb0

by 陶雨
2016-03-08 18:37:18 +0800
Browse Files
1、帮助分类 ...
9dc87779
```
2、帮助内容
3、公告管理
```
by 陶雨
2016-03-08 18:28:44 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
7ac07dca

by 周奇琪
2016-03-08 17:34:46 +0800
Browse Files
实现子级页面,保留父级菜单选项展开和选中,实现方法,采用referer去掉了客户端的实现
07f08dd7

by 周奇琪
2016-03-08 17:34:15 +0800
Browse Files
修改必填项
654fb875

by ping
2016-03-08 15:08:47 +0800
Browse Files
限购商品修改
e6c7e5c3

by weiqingting
2016-03-08 14:52:24 +0800
Browse Files
批量导出
609bd1a2

by weiqingting
2016-03-08 10:56:50 +0800
Browse Files
基础商品
fa541533

by weiqingting
2016-03-08 10:00:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
20c3d9a8

by weiqingting
2016-03-08 09:57:26 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
a554524e

by 王钱钧
2016-03-08 09:34:15 +0800
Browse Files
提交【品牌款型】功能代码。
0934292a

by 王钱钧
2016-03-08 09:34:10 +0800
Browse Files

07 Mar, 2016

5 commits

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
e32d2006

by 王钱钧
2016-03-07 09:28:54 +0800
Browse Files
修改bug。
d97a8319

by 王钱钧
2016-03-07 09:28:49 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
bbdb35a7

by 周奇琪
2016-03-07 09:27:05 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
40b766d0

by 周奇琪
2016-03-07 09:26:20 +0800
Browse Files
Merge branch 'hotfix/grayProxy' into develop ...
203fa451
```
Conflicts:
	client/package.json
```
by 周奇琪
2016-03-07 09:25:32 +0800
Browse Files

05 Mar, 2016

3 commits

网销信息
57952f3c

by liuyue
2016-03-05 16:58:44 +0800
Browse Files
调整灰度请求的返回超时时间为30s
c8c64862

by 周奇琪
2016-03-05 16:25:27 +0800
Browse Files
优化灰度路由,透传req参数
205d633c

by 周奇琪
2016-03-05 15:58:44 +0800
Browse Files

04 Mar, 2016

19 commits

update
f00b1f0e

by ping
2016-03-04 19:21:30 +0800
Browse Files
排队活动
f6a3644f

by ping
2016-03-04 19:19:53 +0800
Browse Files
SALE 专题管理
9ccfbcfb

by 陶雨
2016-03-04 18:18:06 +0800
Browse Files
SALE
dae1ad38

by 陶雨
2016-03-04 18:17:10 +0800
Browse Files
SALE 专题管理
52f05bca

by 陶雨
2016-03-04 18:15:42 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
fc3fbe8a

by weiqingting
2016-03-04 17:59:49 +0800
Browse Files
提交
95e7c59b

by weiqingting
2016-03-04 17:59:37 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
53ef855e

by liuyue
2016-03-04 17:57:12 +0800
Browse Files
店铺接口修改
d7b9e273

by liuyue
2016-03-04 17:57:03 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
397be239
```
Conflicts:
	client/js/activity/edit.js
	client/js/activity/index.js
	client/package.json
	server/interface/activity.js
	server/views/pages/activity/edit.html
```
by 陶雨
2016-03-04 17:38:59 +0800
Browse Files
SALE 专题管理 review by weiqingting
945948a9

by 陶雨
2016-03-04 17:26:26 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop ...
785243db
```
# Conflicts:
#	client/js/activity/edit.js
```
by ping
2016-03-04 17:23:39 +0800
Browse Files
抽签活动
a4e5f252

by ping
2016-03-04 17:22:34 +0800
Browse Files
限售商品
8246024f

by liuyue
2016-03-04 17:02:21 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
799f038e

by liuyue
2016-03-04 15:07:36 +0800
Browse Files
限购bug fix
0d63fe8c

by liuyue
2016-03-04 15:07:30 +0800
Browse Files
提交
63ee0f45

by weiqingting
2016-03-04 14:31:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
eff193df

by weiqingting
2016-03-04 14:24:26 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
0bd3970f

by ping
2016-03-04 14:25:43 +0800
Browse Files