fe / yohobuy-portal-fe2 · Commits

03 Aug, 2016

10 commits

Merge branch 'testBLK' into portal_dev_4.9
4e22bd3c

by dongjunjie
2016-08-03 17:27:52 +0800
Browse Files
mvc
c0e8acb7

by dongjunjie
2016-08-03 17:27:39 +0800
Browse Files
Merge branch 'protal_dev_2.1' into testBLK
77cadf52

by dongjunjie
2016-08-03 17:26:52 +0800
Browse Files
基础商品详情缺少展示平台
ff11faa9

by dongjunjie
2016-08-03 17:26:38 +0800
Browse Files
mvc
cd9e3d9d

by dongjunjie
2016-08-03 17:07:19 +0800
Browse Files
Merge branch 'testBLK' into portal_dev_4.9
253c6b77

by dongjunjie
2016-08-03 17:05:36 +0800
Browse Files
yoho改成有货
4f7a71b1

by dongjunjie
2016-08-03 17:05:19 +0800
Browse Files
店铺装修加入店铺销售类目
c79128c4

by dongjunjie
2016-08-03 17:02:22 +0800
Browse Files
提交
52f54cbb

by weiqingting
2016-08-03 15:25:06 +0800
Browse Files
Merge branch 'testBLK' into portal_dev_4.9
68b4d20e

by dongjunjie
2016-08-03 10:08:48 +0800
Browse Files

02 Aug, 2016

16 commits

提交
3e78bf19

by weiqingting
2016-08-02 16:48:11 +0800
Browse Files
Merge branch 'protal_dev_2.1' into testBLK
f650f1a7

by weiqingting
2016-08-02 16:46:53 +0800
Browse Files
Merge branch 'protal_dev_2.1' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into protal_dev_2.1
8f9a0c1a

by weiqingting
2016-08-02 16:45:35 +0800
Browse Files
提交
193a917b

by weiqingting
2016-08-02 16:45:27 +0800
Browse Files
店铺销售类目
63eef782

by dongjunjie
2016-08-02 16:41:59 +0800
Browse Files
Merge branch 'testBLK' into portal_dev_4.9
2c1e6d34

by dongjunjie
2016-08-02 13:19:31 +0800
Browse Files
Merge branch 'protal_dev_2.1' into testBLK
854623ce

by dongjunjie
2016-08-02 13:02:40 +0800
Browse Files
pdf展示bug
951b2bda

by dongjunjie
2016-08-02 13:02:27 +0800
Browse Files
pdf默认展示bug
c954a14e

by dongjunjie
2016-08-02 12:59:38 +0800
Browse Files
Merge branch 'protal_dev_2.1' into testBLK
d0dde73e

by dongjunjie
2016-08-02 12:52:23 +0800
Browse Files
基础商品小bug
7bf76e8a

by dongjunjie
2016-08-02 12:51:58 +0800
Browse Files
tijiao
158a09cd

by weiqingting
2016-08-02 12:31:34 +0800
Browse Files
Merge branch 'protal_dev_2.1' into testBLK
b9f050dc

by weiqingting
2016-08-02 11:45:46 +0800
Browse Files
tjiao
d4891ab3

by weiqingting
2016-08-02 11:43:39 +0800
Browse Files
网销bug
050afc91

by weiqingting
2016-08-02 11:42:19 +0800
Browse Files
销售类目
bb77df8c

by dongjunjie
2016-08-02 11:29:27 +0800
Browse Files

01 Aug, 2016

11 commits

mvc
66873940

by dongjunjie
2016-08-01 18:23:36 +0800
Browse Files
Merge branch 'protal_dev_2.1' into testBLK ...
5085b538
```
# Conflicts:
#	code/index.js
#	server/index.js
```
by dongjunjie
2016-08-01 18:22:58 +0800
Browse Files
店铺销售类目
f73fd605

by dongjunjie
2016-08-01 18:05:23 +0800
Browse Files
Merge branch 'protal_dev_2.1' into portal_dev_4.9 ...
efd67812
```
# Conflicts:
#	code/apps/shop/controllers/shopCategory.js
#	code/index.js
```
by dongjunjie
2016-08-01 15:54:19 +0800
Browse Files
mvc
f4bca5bc

by dongjunjie
2016-08-01 15:50:36 +0800
Browse Files
店铺销售类目增删改查
6b56a20a

by dongjunjie
2016-08-01 15:35:47 +0800
Browse Files
提交
fe1464d8

by weiqingting
2016-08-01 14:35:43 +0800
Browse Files
Merge branch 'protal_dev_blk' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into protal_dev_blk
9ce2d237

by dongjunjie
2016-08-01 10:58:58 +0800
Browse Files
blk跟yoho店铺联调修改接口
563141ba

by dongjunjie
2016-08-01 10:58:53 +0800
Browse Files
提交
633d12cb

by weiqingting
2016-08-01 09:45:50 +0800
Browse Files
提交
7d6712dc

by weiqingting
2016-08-01 09:43:05 +0800
Browse Files

29 Jul, 2016

3 commits

提交
6f1ea336

by weiqingting
2016-07-29 16:33:42 +0800
Browse Files
提交
1f9bd6ca

by weiqingting
2016-07-29 14:36:05 +0800
Browse Files
.
e19a5c2b

by weiqingting
2016-07-29 13:33:19 +0800
Browse Files