fe / yohobuy-portal-fe · Commits

04 Mar, 2016

17 commits

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

21 commits

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
品牌合作模式
f9fad9fc

by liuyue
2016-03-03 15:43:08 +0800
Browse Files
上传添加用户数据
397745b1

by weiqingting
2016-03-03 15:39:42 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
03390539

by liuyue
2016-03-03 15:22:22 +0800
Browse Files
进入变价筛选置灰
8fc19f26

by liuyue
2016-03-03 15:22:19 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
02ba678e

by liuyue
2016-03-03 14:43:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
e633cde6

by weiqingting
2016-03-03 14:43:34 +0800
Browse Files
代销变价，限售商品
2edf18b8

by liuyue
2016-03-03 14:43:34 +0800
Browse Files
删除验证
a0287e8c

by weiqingting
2016-03-03 14:43:21 +0800
Browse Files
商品管理bug fix
1c10809c

by liuyue
2016-03-03 10:19:59 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
e70c1a43

by weiqingting
2016-03-03 10:19:59 +0800
Browse Files
店铺装修
a5ee591c

by weiqingting
2016-03-03 10:19:52 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
4661a428

by liuyue
2016-03-03 09:51:15 +0800
Browse Files
限购商品
b2db7a8c

by liuyue
2016-03-03 09:51:09 +0800
Browse Files

02 Mar, 2016

2 commits

修改bug
17e8bd68

by 王钱钧
2016-03-02 18:23:36 +0800
Browse Files
测试
4128285d

by 王钱钧
2016-03-02 18:22:44 +0800
Browse Files