fe / yohobuy-portal-fe · Commits

29 Feb, 2016

13 commits

代销变价
f6f1863f

by liuyue
2016-02-29 18:02:36 +0800
Browse Files
market
428cccae

by liuyue
2016-02-29 15:54:25 +0800
Browse Files
测试环境端口
12521242

by liuyue
2016-02-29 15:53:29 +0800
Browse Files
在app里面添加isJsonRaw配置 ...
42356b9d
```
去掉noApi和isJsonRaw配置
```
by 周奇琪
2016-02-29 14:51:26 +0800
Browse Files
Merge branch 'master' into develop
597e4466

by 周奇琪
2016-02-29 13:49:48 +0800
Browse Files
Merge branch 'master' of git.dev.yoho.cn:platform/yohobuy-portal-fe
9fee518e

by 周奇琪
2016-02-29 13:47:16 +0800
Browse Files
修改API文档生成的样式加载不了的问题
6cfd7193

by 周奇琪
2016-02-29 13:46:25 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
082285fb

by liuyue
2016-02-29 11:51:34 +0800
Browse Files
限售bug
66f04b5f

by liuyue
2016-02-29 11:51:25 +0800
Browse Files
Merge branch 'master' into develop
1065ff0d

by weiqingting
2016-02-29 09:37:40 +0800
Browse Files
重复过滤bug修改
7ff8d5b8

by weiqingting
2016-02-29 09:33:14 +0800
Browse Files
vip活动积分确认弹框
be654498

by liuyue
2016-02-29 09:30:44 +0800
Browse Files
Revert "bug修改" ...
fc182e40
```
This reverts commit dbad1acc.
```
by weiqingting
2016-02-29 09:30:40 +0800
Browse Files

27 Feb, 2016

14 commits

bug修改
dbad1acc

by weiqingting
2016-02-27 20:55:07 +0800
Browse Files
时间控件bug修改
a0ff7f71

by weiqingting
2016-02-27 16:59:51 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
0073f3b0

by liuyue
2016-02-27 16:10:53 +0800
Browse Files
vip
0580993a

by liuyue
2016-02-27 16:10:43 +0800
Browse Files
Merge branch 'release/1.3' into develop
336cbfa6

by weiqingting
2016-02-27 16:07:07 +0800
Browse Files
Merge branch 'release/1.3'
07e617a0

by weiqingting
2016-02-27 16:07:06 +0800
Browse Files
路由恢复
c736183e

by weiqingting
2016-02-27 16:03:30 +0800
Browse Files
接口配置修改
e695eea1

by weiqingting
2016-02-27 15:50:58 +0800
Browse Files
vip积分翻倍
7e83c0d2

by liuyue
2016-02-27 15:34:20 +0800
Browse Files
market
113a0811

by liuyue
2016-02-27 14:11:45 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
93987231

by liuyue
2016-02-27 14:09:06 +0800
Browse Files
vipamount
93f79e1c

by liuyue
2016-02-27 14:09:00 +0800
Browse Files
注销路由
7c721c67

by weiqingting
2016-02-27 14:08:31 +0800
Browse Files
提交
d096ffce

by weiqingting
2016-02-27 13:06:26 +0800
Browse Files

26 Feb, 2016

13 commits

Merge branch 'hotfix/cssbug' into develop ...
62b0db68
```
Conflicts:
	server/views/partials/header.html
```
by 周奇琪
2016-02-26 21:13:30 +0800
Browse Files
Merge branch 'hotfix/cssbug'
c5dbd423

by 周奇琪
2016-02-26 21:05:57 +0800
Browse Files
去掉MD5
8b4b22a8

by 周奇琪
2016-02-26 21:05:39 +0800
Browse Files
Merge branch 'hotfix/cssbug'
8176b54d

by 周奇琪
2016-02-26 20:34:06 +0800
Browse Files
css样式修改
91b73744

by 周奇琪
2016-02-26 20:33:49 +0800
Browse Files
Merge branch 'hotfix/loginbug' into develop ...
dfd05ac1
```
Conflicts:
	server/views/pages/login.html
```
by 周奇琪
2016-02-26 19:03:59 +0800
Browse Files
Merge branch 'hotfix/loginbug'
f08947a9

by 周奇琪
2016-02-26 19:01:39 +0800
Browse Files
no message
ece30ad2

by 周奇琪
2016-02-26 19:01:15 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
01728fa0

by 周奇琪
2016-02-26 18:58:28 +0800
Browse Files
Merge branch 'hotfix/loginbug' into develop ...
33d1bf6f
```
Conflicts:
	server/views/pages/login.html
```
by 周奇琪
2016-02-26 18:55:49 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
43fc3e11

by 王钱钧
2016-02-26 18:55:06 +0800
Browse Files
修改页面问题。
dc2f17c8

by 王钱钧
2016-02-26 18:54:55 +0800
Browse Files
Merge branch 'hotfix/loginbug'
32d67813

by 周奇琪
2016-02-26 18:54:31 +0800
Browse Files