fe / yohobuy-portal-fe · Commits

09 Mar, 2016

1 commit

网销
1dd0dab3

by liuyue
2016-03-09 09:36:20 +0800
Browse Files

07 Mar, 2016

5 commits

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 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
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

20 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 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
抽签活动
d5a8cf12

by ping
2016-03-04 14:25:30 +0800
Browse Files
提交
25dc8662

by weiqingting
2016-03-04 14:24:17 +0800
Browse Files
限量变价上传type
9a60458c

by liuyue
2016-03-04 13:54:43 +0800
Browse Files

03 Mar, 2016

11 commits

如果是数组的form数据,使用querystring提交
146c9894

by 周奇琪
2016-03-03 20:38:50 +0800
Browse Files
添加querystring模块
3fe77fa9

by 周奇琪
2016-03-03 19:54:09 +0800
Browse Files
灰度修复表单提交如果是数组，提交失败的问题
11ec0b30

by 周奇琪
2016-03-03 19:52:36 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
cb39a46a
```
# Conflicts:
#	server/stub/service/upload.js
```
by weiqingting
2016-03-03 18:50:15 +0800
Browse Files
上传提交
4e1fbf33

by weiqingting
2016-03-03 18:48:52 +0800
Browse Files
限售商品
2f919099

by liuyue
2016-03-03 18:47:37 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
1ef0c7a9

by liuyue
2016-03-03 18:46:07 +0800
Browse Files
限售商品
74c79878

by liuyue
2016-03-03 18:45:58 +0800
Browse Files
提交
998ba127

by weiqingting
2016-03-03 18:20:47 +0800
Browse Files
upload
fdf3c056

by liuyue
2016-03-03 17:09:26 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
96b18722

by liuyue
2016-03-03 15:43:55 +0800
Browse Files