fe / yohobuy-node · Commits

18 Apr, 2017

40 commits

Merge branch 'release/5.6' into release/security
bf2c260a

by yyq
2017-04-18 18:37:35 +0800
Browse Files
Merge branch 'feature/newGolbal' into release/5.6
ea47a970

by yyq
2017-04-18 18:37:02 +0800
Browse Files
Merge branch 'release/5.6' of git.yoho.cn:fe/yohobuy-node into release/5.6
ba951342

by yyq
2017-04-18 18:36:46 +0800
Browse Files
query shop sort
695fa5c5

by yyq
2017-04-18 18:36:30 +0800
Browse Files
Merge branch 'release/5.6' into release/security
458d5538

by 郝肖肖
2017-04-18 18:06:53 +0800
Browse Files
Merge branch 'feature/meal' into release/5.6
0863b7df

by 郝肖肖
2017-04-18 17:54:23 +0800
Browse Files
Merge branch 'feature/swindleInfo' into release/5.6
0bc2554d

by 郝肖肖
2017-04-18 17:54:16 +0800
Browse Files
诈骗提醒文字样式修改
723b1216

by 郝肖肖
2017-04-18 17:53:39 +0800
Browse Files
套餐加入购物车，去除以前的立即购买埋点
48532c8d

by 郝肖肖
2017-04-18 17:49:58 +0800
Browse Files
global data
e536763a

by 周少峰
2017-04-18 16:46:43 +0800
Browse Files
Merge branch 'master' into release/security
9e740764

by 周少峰
2017-04-18 16:43:39 +0800
Browse Files
Merge branch 'release/5.6' into release/security
d77227c7

by 郝肖肖
2017-04-18 16:35:10 +0800
Browse Files
Merge branch 'feature/meal' into release/5.6
6a2015dd

by 郝肖肖
2017-04-18 16:34:31 +0800
Browse Files
Merge branch 'hotfix/listGlobal'
51117f41

by 周少峰
2017-04-18 16:33:15 +0800
Browse Files
套餐加入购物车，shoppingKey 不存在，设置key
8780a0e8

by 郝肖肖
2017-04-18 16:33:08 +0800
Browse Files
Merge branch 'hotfix/listGlobal' of git.yoho.cn:fe/yohobuy-node into hotfix/listGlobal
f2307dcc

by yyq
2017-04-18 16:24:00 +0800
Browse Files
del global prod
3d5edc5d

by yyq
2017-04-18 16:23:50 +0800
Browse Files
Merge branch 'release/5.6' into release/security
26eb01b7

by 郝肖肖
2017-04-18 16:16:59 +0800
Browse Files
Merge branch 'feature/passReset' into release/5.6
bc34c96c

by 郝肖肖
2017-04-18 16:16:26 +0800
Browse Files
弱密码 token为空，清除上次数据
2a4bae67

by 郝肖肖
2017-04-18 16:15:52 +0800
Browse Files
upversion 5.5.31
86ae2467

by 周少峰
2017-04-18 15:47:39 +0800
Browse Files
Merge branch 'feature/cusService-codeRules' into hotfix/listGlobal
18e1ef72

by 周少峰
2017-04-18 15:46:44 +0800
Browse Files
Merge branch 'release/5.6' into release/security
715d61c6

by yyq
2017-04-18 15:30:39 +0800
Browse Files
Merge branch 'release/5.6' of git.yoho.cn:fe/yohobuy-node into release/5.6
6cb6a625

by yyq
2017-04-18 15:29:59 +0800
Browse Files
Merge branch 'feature/newGolbal' into release/5.6
40386ed5

by yyq
2017-04-18 15:29:49 +0800
Browse Files
shop status
757e3473

by yyq
2017-04-18 15:29:15 +0800
Browse Files
del handel alphabet
df3445b0

by yyq
2017-04-18 15:13:05 +0800
Browse Files
Merge branch 'release/5.6' into release/security
12d0e066

by 郝肖肖
2017-04-18 15:04:05 +0800
Browse Files
诈骗图片
4d9f4f1d

by 郝肖肖
2017-04-18 15:03:35 +0800
Browse Files
Merge branch 'feature/swindleInfo' of git.yoho.cn:fe/yohobuy-node into feature/swindleInfo
7a38b41c

by 郝肖肖
2017-04-18 15:02:28 +0800
Browse Files
防诈骗图标换成图片
0afedec2

by 郝肖肖
2017-04-18 15:02:12 +0800
Browse Files
Merge branch 'release/5.6' into release/security
9b1a6c98

by yyq
2017-04-18 14:45:28 +0800
Browse Files
Merge branch 'release/5.6' of git.yoho.cn:fe/yohobuy-node into release/5.6
710ae7cb

by yyq
2017-04-18 14:44:46 +0800
Browse Files
Merge branch 'feature/swindleInfo' into release/5.6
f6d27bca

by yyq
2017-04-18 14:44:35 +0800
Browse Files
Merge branch 'feature/cusService-codeRules' into 'release/5.6' ...
785f1afe
```
客服功能代码规范问题修正

客服功能代码规范问题修正

See merge request !113
```
by 周少峰
2017-04-18 14:43:49 +0800
Browse Files
font
80e7bf03

by yyq
2017-04-18 14:42:27 +0800
Browse Files
Merge branch 'release/5.6' into release/security
fc507c60

by 郝肖肖
2017-04-18 14:15:33 +0800
Browse Files
Merge branch 'feature/swindleInfo' into release/5.6
740f9f2b

by 郝肖肖
2017-04-18 14:13:56 +0800
Browse Files
修复冲突
9cc332fc

by 郝肖肖
2017-04-18 14:13:34 +0800
Browse Files
Merge branch 'feature/passReset' into release/5.6
23f23f82

by 郝肖肖
2017-04-18 14:07:54 +0800
Browse Files