fe / yohobuy-portal-fe · Commits

01 Mar, 2016

23 commits

Merge branch 'release/1.4'
20f32ec3

by weiqingting
2016-03-01 18:58:59 +0800
Browse Files
删除package
2faf5281

by weiqingting
2016-03-01 18:58:32 +0800
Browse Files
vip积分统计预发布
d8082d72

by weiqingting
2016-03-01 18:44:22 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
e28ab39f

by weiqingting
2016-03-01 18:04:05 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
ab450ef5
```
# Conflicts:
#	server/stub/service/upload.js
```
by weiqingting
2016-03-01 18:03:59 +0800
Browse Files
vip积分路由
e9bf91af

by liuyue
2016-03-01 18:03:45 +0800
Browse Files
提交
1d8db668

by weiqingting
2016-03-01 17:57:15 +0800
Browse Files
限购码部门筛选条件
39f70c3b

by liuyue
2016-03-01 17:53:53 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
cacf1667

by liuyue
2016-03-01 17:51:37 +0800
Browse Files
品牌合作模式上传
e322e27b

by liuyue
2016-03-01 17:51:34 +0800
Browse Files
修改bug
852eabc4

by 王钱钧
2016-03-01 17:49:56 +0800
Browse Files
upload
664dd795

by liuyue
2016-03-01 17:44:19 +0800
Browse Files
文件上传
59c73d42

by liuyue
2016-03-01 17:43:29 +0800
Browse Files
提交
0520778c

by weiqingting
2016-03-01 16:29:03 +0800
Browse Files
限购码及价格管理
e1cf4830

by liuyue
2016-03-01 16:10:54 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
984a195d

by weiqingting
2016-03-01 16:10:29 +0800
Browse Files
视频上传
6da87dcf

by weiqingting
2016-03-01 16:10:12 +0800
Browse Files
限购码管理
e0503043

by liuyue
2016-03-01 14:47:46 +0800
Browse Files
bug修改
7247f354

by weiqingting
2016-03-01 11:07:19 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
39efc695

by weiqingting
2016-03-01 11:00:47 +0800
Browse Files
bug修改
ac0e6938

by weiqingting
2016-03-01 11:00:40 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
5ee23419

by 王钱钧
2016-03-01 09:26:12 +0800
Browse Files
修改bug。 code review by 大卫
2a15885d

by 王钱钧
2016-03-01 09:26:06 +0800
Browse Files

29 Feb, 2016

15 commits

提交
5374c9e0

by weiqingting
2016-02-29 20:28:35 +0800
Browse Files
验证修改
11b51f5c

by weiqingting
2016-02-29 20:27:55 +0800
Browse Files
代销变价
f6f1863f

by liuyue
2016-02-29 18:02:36 +0800
Browse Files
market
428cccae

by liuyue
2016-02-29 15:54:25 +0800
Browse Files
测试环境端口
12521242

by liuyue
2016-02-29 15:53:29 +0800
Browse Files
在app里面添加isJsonRaw配置 ...
42356b9d
```
去掉noApi和isJsonRaw配置
```
by 周奇琪
2016-02-29 14:51:26 +0800
Browse Files
Merge branch 'master' into develop
597e4466

by 周奇琪
2016-02-29 13:49:48 +0800
Browse Files
Merge branch 'master' of git.dev.yoho.cn:platform/yohobuy-portal-fe
9fee518e

by 周奇琪
2016-02-29 13:47:16 +0800
Browse Files
修改API文档生成的样式加载不了的问题
6cfd7193

by 周奇琪
2016-02-29 13:46:25 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
082285fb

by liuyue
2016-02-29 11:51:34 +0800
Browse Files
限售bug
66f04b5f

by liuyue
2016-02-29 11:51:25 +0800
Browse Files
Merge branch 'master' into develop
1065ff0d

by weiqingting
2016-02-29 09:37:40 +0800
Browse Files
重复过滤bug修改
7ff8d5b8

by weiqingting
2016-02-29 09:33:14 +0800
Browse Files
vip活动积分确认弹框
be654498

by liuyue
2016-02-29 09:30:44 +0800
Browse Files
Revert "bug修改" ...
fc182e40
```
This reverts commit dbad1acc.
```
by weiqingting
2016-02-29 09:30:40 +0800
Browse Files

27 Feb, 2016

2 commits

bug修改
dbad1acc

by weiqingting
2016-02-27 20:55:07 +0800
Browse Files
时间控件bug修改
a0ff7f71

by weiqingting
2016-02-27 16:59:51 +0800
Browse Files