fe / yohobuy-portal-fe · Commits

26 Feb, 2016

27 commits

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
修复登陆的样式问题和正则过于严格的问题
9bd3d29f

by 周奇琪
2016-02-26 18:54:06 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
6d2bbb36

by liuyue
2016-02-26 18:01:30 +0800
Browse Files
限购码，品牌合作模式表头下载
693cd5be

by liuyue
2016-02-26 18:01:27 +0800
Browse Files
代码优化
3869879c

by weiqingting
2016-02-26 17:17:45 +0800
Browse Files
热搜词列表添加【频道】、【链接】列。
b06408bc

by 王钱钧
2016-02-26 17:03:59 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
b4938449

by liuyue
2016-02-26 16:36:29 +0800
Browse Files
domain
c00723e3

by liuyue
2016-02-26 16:36:23 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
1e0fe299

by weiqingting
2016-02-26 16:35:00 +0800
Browse Files
恢复配置信息
f09617ac

by weiqingting
2016-02-26 16:34:45 +0800
Browse Files
vip金额结束
adb3c08b

by liuyue
2016-02-26 16:32:09 +0800
Browse Files
修改构建
ba3dd4b0

by weiqingting
2016-02-26 16:28:22 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
30b6e62e

by weiqingting
2016-02-26 14:18:32 +0800
Browse Files
vip金额结束
d64aaf17

by liuyue
2016-02-26 14:14:55 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop ...
b97c56d6
```
# Conflicts:
#	public/css/all.css
#	public/css/index.css
```
by weiqingting
2016-02-26 14:12:26 +0800
Browse Files
样式整理
d25039f7

by weiqingting
2016-02-26 14:07:52 +0800
Browse Files
限售商品
21742790

by liuyue
2016-02-26 13:54:55 +0800
Browse Files
vip时间
b53ef866

by liuyue
2016-02-26 12:28:26 +0800
Browse Files
vip时间
85ca25ef

by liuyue
2016-02-26 12:27:54 +0800
Browse Files
vip时间
fe0768d5

by liuyue
2016-02-26 12:27:15 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
38810b6c

by weiqingting
2016-02-26 10:40:22 +0800
Browse Files
bug修改
ad2714ae

by weiqingting
2016-02-26 10:40:15 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
6eb08413

by 王钱钧
2016-02-26 09:08:25 +0800
Browse Files
修改bug。
cfd89091

by 王钱钧
2016-02-26 09:08:15 +0800
Browse Files

25 Feb, 2016

13 commits

样式修改
c03cebf4

by weiqingting
2016-02-25 21:01:15 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop
e17363c7

by weiqingting
2016-02-25 20:47:13 +0800
Browse Files
提交
8cc716fb

by weiqingting
2016-02-25 20:47:05 +0800
Browse Files
品牌合作模式
c4b5d267

by liuyue
2016-02-25 20:45:58 +0800
Browse Files
品牌合作模式
7682a25e

by liuyue
2016-02-25 20:39:23 +0800
Browse Files
upload.js
c89db0e5

by liuyue
2016-02-25 20:00:06 +0800
Browse Files
品牌合作模式
111d0f54

by liuyue
2016-02-25 19:59:15 +0800
Browse Files
Merge branch 'hotfix/test' into develop
febc69eb

by weiqingting
2016-02-25 19:45:47 +0800
Browse Files
上传接口修改
d6dcbafb

by weiqingting
2016-02-25 19:01:42 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
e789f7ef

by liuyue
2016-02-25 18:58:13 +0800
Browse Files
变价全部删除
eae3cbfd

by liuyue
2016-02-25 18:58:07 +0800
Browse Files
bug修改提交
f1ffe3ef

by weiqingting
2016-02-25 18:21:38 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:platform/yohobuy-portal-fe into develop
5ffef230

by liuyue
2016-02-25 17:33:17 +0800
Browse Files