fe / yoho-blk · Commits

25 Jul, 2016

40 commits

Merge remote-tracking branch 'origin/release/1.0' into release/1.0
55e9ebb1

by htoooth
2016-07-25 17:56:05 +0800
Browse Files
删除console。
94427974

by htoooth
2016-07-25 17:55:54 +0800
Browse Files
Merge branch 'feature/shopping' into release/1.0
3fdbc797

by jinhu.tung
2016-07-25 17:40:43 +0800
Browse Files
fixed double or many click edit color and size
627ef092

by jinhu.tung
2016-07-25 17:26:11 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
1227dcd9

by htoooth
2016-07-25 17:10:55 +0800
Browse Files
第三方页面的国家代码。
111b9611

by htoooth
2016-07-25 17:09:58 +0800
Browse Files
editorial
936e1b4d

by zhangxiaoru
2016-07-25 16:53:30 +0800
Browse Files
editorial
e01ff01a

by zhangxiaoru
2016-07-25 16:52:29 +0800
Browse Files
remove unused route
17bc9c27

by jinhu.tung
2016-07-25 16:51:07 +0800
Browse Files
add annotations
8f5b51f3

by jinhu.tung
2016-07-25 16:49:20 +0800
Browse Files
注册页面的国家代码。
7da85961

by htoooth
2016-07-25 16:49:00 +0800
Browse Files
add annotation and doc
55a0ecd8

by jinhu.tung
2016-07-25 16:48:42 +0800
Browse Files
提交国家代码。
854d686a

by htoooth
2016-07-25 16:40:09 +0800
Browse Files
brand url of payment goods list
0083f01f

by xuqi
2016-07-25 16:15:20 +0800
Browse Files
调整模板。
903ee606

by htoooth
2016-07-25 16:12:32 +0800
Browse Files
add removed products layout
0f299faf

by jinhu.tung
2016-07-25 16:10:02 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
6ceb2b1a

by htoooth
2016-07-25 16:04:07 +0800
Browse Files
remove unuseless file
5999e660

by htoooth
2016-07-25 16:03:51 +0800
Browse Files
调整 CSS。
baa43906

by htoooth
2016-07-25 16:00:42 +0800
Browse Files
handle merge
4411ba15

by 姜枫
2016-07-25 15:51:00 +0800
Browse Files
修复格式。
6fa57fbd

by htoooth
2016-07-25 15:50:29 +0800
Browse Files
handle merge
bb58fbb4

by 姜枫
2016-07-25 15:50:20 +0800
Browse Files
remove console.log
4f7454f0

by 姜枫
2016-07-25 15:44:27 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0 ...
3f04d614
```
# Conflicts:
#	config/common.js
```
by htoooth
2016-07-25 15:24:42 +0800
Browse Files
修复重复绑定的问题。
3a828c06

by htoooth
2016-07-25 15:23:05 +0800
Browse Files
api: http://testapi.yoho.cn:28078/, // devapi.yoho.cn:58078 testapi.yoho.cn:2807… ...
56bab103
```
…8 devapi.yoho.cn:58078
```
by 姜枫
2016-07-25 15:13:08 +0800
Browse Files
fix bug 225
2aaa452f

by 姜枫
2016-07-25 15:12:35 +0800
Browse Files
change css
9bacd16e

by htoooth
2016-07-25 15:05:18 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
92e717a6

by jinhu.tung
2016-07-25 14:37:05 +0800
Browse Files
remove products at least one
dcbdcadf

by jinhu.tung
2016-07-25 14:36:53 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
6216c625

by xuqi
2016-07-25 14:31:04 +0800
Browse Files
Merge branch 'feature/shopping' into release/1.0
7900ce5d

by jinhu.tung
2016-07-25 14:30:44 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
25f52749

by jinhu.tung
2016-07-25 14:30:00 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
52ef8af8

by xuqi
2016-07-25 14:29:50 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
7fb3b638

by xuqi
2016-07-25 14:24:01 +0800
Browse Files
add comments
2bfbf3ad

by xuqi
2016-07-25 14:23:44 +0800
Browse Files
add code comment
e9cfff32

by 姜枫
2016-07-25 14:22:47 +0800
Browse Files
add code comment
b22392c6

by 姜枫
2016-07-25 14:22:41 +0800
Browse Files
invalid product sales_price
6463d60b

by jinhu.tung
2016-07-25 14:13:20 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
694fa4db

by 姜敏
2016-07-25 14:09:50 +0800
Browse Files