fe / yohobuy-node · Commits

23 Dec, 2016

8 commits

Merge branch 'release/customer-service2' into feature/merge-captcha
6e19025f

by 周少峰
2016-12-23 14:37:49 +0800
Browse Files
Merge remote-tracking branch 'origin/release/customer-service2' into release/customer-service2 ...
23a73c2b
```
# Conflicts:
#	app.js
```
by 徐炜
2016-12-23 14:24:36 +0800
Browse Files
Merge branch 'master' into feature/merge-captcha
0ef917e1

by 周少峰
2016-12-23 10:50:27 +0800
Browse Files
Merge branch 'hotfix/goodsStyle'
eba3440d

by 周少峰
2016-12-23 10:50:09 +0800
Browse Files
Merge branch 'hotfix/goodsStyle' into feature/merge-captcha
fea3be3d

by 周少峰
2016-12-23 10:49:44 +0800
Browse Files
merge
d57b3d85

by htoooth
2016-12-23 10:30:49 +0800
Browse Files
fix
9a3bbea7

by htoooth
2016-12-23 10:11:05 +0800
Browse Files
update lib
d1143085

by htoooth
2016-12-23 10:04:31 +0800
Browse Files

22 Dec, 2016

17 commits

fixed:客服接口异常catch添加
0703597a

by 李奇
2016-12-22 21:08:42 +0800
Browse Files
fixed:不支持浏览器渲染页添加
d8febaf6

by 李奇
2016-12-22 20:55:34 +0800
Browse Files
Merge branch 'feature/clientServiceSwitch' into release/customer-service2
062bd995

by 郝肖肖
2016-12-22 20:12:43 +0800
Browse Files
Merge remote-tracking branch 'origin/feature/captcha' into feature/captcha
e9ecbfd3

by htoooth
2016-12-22 20:04:58 +0800
Browse Files
add home
ba3a351e

by htoooth
2016-12-22 20:04:33 +0800
Browse Files
edit
6997abf2

by htoooth
2016-12-22 18:34:58 +0800
Browse Files
devtool
7f7f281f

by 徐炜
2016-12-22 18:02:19 +0800
Browse Files
add file
3650ca38

by htoooth
2016-12-22 17:42:04 +0800
Browse Files
devtool
24a7f54d

by 徐炜
2016-12-22 17:36:19 +0800
Browse Directory »
Merge branch 'feature/clientServiceSwitch' into release/customer-service2
6d151fcd

by 郝肖肖
2016-12-22 17:25:50 +0800
Browse Files
Merge remote-tracking branch 'origin/feature/customerService' into feature/customerService
61675d19

by 徐炜
2016-12-22 17:09:43 +0800
Browse Files
devtool
6a16ada4

by 徐炜
2016-12-22 17:08:07 +0800
Browse Files
处理降级zookeeper读取后，写入memcached
ec6355d1

by 姜枫
2016-12-22 15:52:54 +0800
Browse Files
Merge branch 'master' into hotfix/goodsStyle
12490c20

by 周少峰
2016-12-22 15:29:30 +0800
Browse Files
客服开关走 zookeeper配置
9eaa1cb1

by 郝肖肖
2016-12-22 15:12:10 +0800
Browse Files
同时支持MemcachedSession和CookieSession
87e94984

by 姜枫
2016-12-22 13:40:35 +0800
Browse Files
fix captcha
9cff09a3

by htoooth
2016-12-22 09:48:59 +0800
Browse Files

21 Dec, 2016

15 commits

Merge branch 'release/customer-service'
f281b68c

by 周少峰
2016-12-21 21:25:33 +0800
Browse Files
Merge branch 'release/customer-service' of git.yoho.cn:fe/yohobuy-node into release/customer-service
fb4126f4

by 周少峰
2016-12-21 21:25:09 +0800
Browse Files
路由修改
9e51b058

by 徐炜
2016-12-21 21:23:45 +0800
Browse Directory »
Merge branch 'release/customer-service'
bf961819

by 周少峰
2016-12-21 20:18:23 +0800
Browse Files
update v 5.3.3
7ea7f255

by 周少峰
2016-12-21 20:18:04 +0800
Browse Files
合并代码
0246e725

by 徐炜
2016-12-21 19:59:07 +0800
Browse Files
Merge branch 'feature/customerService' into feature/customerServiceDemo
0773a819

by 徐炜
2016-12-21 19:55:18 +0800
Browse Directory »
修复homeNav function
055d8999

by 郝肖肖
2016-12-21 19:47:06 +0800
Browse Files
captcha
669d374b

by htoooth
2016-12-21 19:09:57 +0800
Browse Files
merage master
0cf9e13c

by 郝肖肖
2016-12-21 19:07:57 +0800
Browse Directory »
客服开关
458f2174

by 徐炜
2016-12-21 18:30:56 +0800
Browse Directory »
Merge remote-tracking branch 'origin/feature/customerService' into feature/customerService
7d26e058

by 徐炜
2016-12-21 17:29:25 +0800
Browse Files
Merge branch 'feature/customerService' of git.yoho.cn:fe/yohobuy-node into feature/customerService
57919453

by 郝肖肖
2016-12-21 17:27:41 +0800
Browse Files
客服开关设置cache
dc8f39bf

by 郝肖肖
2016-12-21 17:27:25 +0800
Browse Directory »
fixed:默认渲染meta添加
80a2dfc5

by 李奇
2016-12-21 16:47:09 +0800
Browse Files