fe / yoho-blk · Commits

12 Jul, 2016

7 commits

address dialogs for order
295a2e6b

by xuqi
2016-07-12 15:19:26 +0800
Browse Files
Merge branch 'develop' into feature/shopping
b1080f90

by xuqi
2016-07-12 09:42:04 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/yoho-blk into develop
ced9fb24

by biao
2016-07-12 09:25:35 +0800
Browse Files
Merge branch 'feature/my-order' into develop
7a50709e

by biao
2016-07-12 09:25:19 +0800
Browse Files
update for badge
3781e0a9

by biao
2016-07-12 09:24:39 +0800
Browse Files
handle merge
ed5042cb

by 姜枫
2016-07-12 09:12:34 +0800
Browse Files
处理鼠标cursor 形状
2e989b1c

by 姜枫
2016-07-12 09:12:17 +0800
Browse Files

11 Jul, 2016

33 commits

cursor on new address
bbc7dbfa

by xuqi
2016-07-11 19:48:35 +0800
Browse Files
reset address
13b83055

by jinhu.tung
2016-07-11 19:42:38 +0800
Browse Files
reset address
d3b29d1d

by jinhu.tung
2016-07-11 19:42:00 +0800
Browse Files
address spread
525f8e7f

by xuqi
2016-07-11 19:02:25 +0800
Browse Files
leaks codes
d45b037c

by xuqi
2016-07-11 18:29:30 +0800
Browse Files
Merge branch 'feature/shopping' of http://git.yoho.cn/fe/yoho-blk into feature/shopping ...
0d0550d1
```
Conflicts:
	apps/shopping/controllers/order.js
	apps/shopping/views/action/order.hbs
```
by xuqi
2016-07-11 18:23:21 +0800
Browse Files
fix reqire error
87bed037

by 姜枫
2016-07-11 17:31:39 +0800
Browse Files
handle merge
ac125f82

by 姜枫
2016-07-11 17:29:40 +0800
Browse Files
个性化滚动条插件
029449bc

by 姜枫
2016-07-11 17:29:20 +0800
Browse Files
Merge branch 'develop' into feature/my-order
9bfdc39f

by biao
2016-07-11 17:11:00 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/yoho-blk into develop
ea769fa8

by biao
2016-07-11 17:10:29 +0800
Browse Files
Merge branch 'feature/my-order' into develop
02476395

by biao
2016-07-11 17:10:21 +0800
Browse Files
update for countdown timer, order type and order create time
482ee177

by biao
2016-07-11 17:09:19 +0800
Browse Files
添加div滚动条
0f83f1b4

by 姜枫
2016-07-11 17:06:47 +0800
Browse Files
添加div滚动条
7e962fe5

by 姜枫
2016-07-11 17:06:32 +0800
Browse Files
invoice
444f701c

by xuqi
2016-07-11 16:23:13 +0800
Browse Files
support keep
ba8bcb4c

by xuqi
2016-07-11 16:20:34 +0800
Browse Files
send good to favorite
5b206730

by jinhu.tung
2016-07-11 15:49:28 +0800
Browse Files
remove product
f3944455

by jinhu.tung
2016-07-11 15:38:19 +0800
Browse Files
tooltip for good is not enough
070b44e8

by jinhu.tung
2016-07-11 14:32:08 +0800
Browse Files
rename shopping stylesheet file name
6137f4a3

by jinhu.tung
2016-07-11 13:51:41 +0800
Browse Files
shopping car modify good number
37891d9f

by jinhu.tung
2016-07-11 13:41:02 +0800
Browse Files
merge from feature/product
9f42eb94

by 姜枫
2016-07-11 13:28:45 +0800
Browse Files
完善列表页
f14b443e

by 姜枫
2016-07-11 13:27:58 +0800
Browse Files
完善列表页
82b09e94

by 姜枫
2016-07-11 13:27:45 +0800
Browse Files
brand
545951c4

by zhangxiaoru
2016-07-11 13:25:42 +0800
Browse Files
品牌
64c040ab

by zhangxiaoru
2016-07-11 13:22:32 +0800
Browse Files
品牌JS
a13d3c04

by zhangxiaoru
2016-07-11 11:18:28 +0800
Browse Files
品牌JS
6c79fe8e

by zhangxiaoru
2016-07-11 11:18:04 +0800
Browse Files
mrege from develop
ceedd7f0

by 姜枫
2016-07-11 11:09:02 +0800
Browse Files
fix nav bugs when url contains type param
4c096b3d

by biao
2016-07-11 10:25:23 +0800
Browse Files
Merge branch 'develop' into feature/shopping ...
79185408
```
Conflicts:
	public/font/iconfont.svg
```
by xuqi
2016-07-11 10:10:01 +0800
Browse Files
merge
069033c8

by 姜枫
2016-07-11 09:53:09 +0800
Browse Files