ued / yohogirls-views · Commits

29 Apr, 2015

7 commits

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop ...
dca1c3f0
```
Conflicts:
	views
```
by happyhour7
2015-04-29 15:10:26 +0800
Browse Files
video频道二级导航完成
3b1e60b8

by happyhour7
2015-04-29 15:08:34 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop
4f1dcce0

by 2586703@qq.com
2015-04-29 13:32:47 +0800
Browse Files
detail数据格式说明修改
d429793f

by 2586703@qq.com
2015-04-29 13:32:39 +0800
Browse Files
添加详情页数据格式
e3a42a0e

by lore-w
2015-04-29 13:10:38 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-views into develop
f3d32fc1

by lore-w
2015-04-29 10:03:13 +0800
Browse Files
修改video页数据
50e00b96

by lore-w
2015-04-29 10:03:05 +0800
Browse Files

28 Apr, 2015

7 commits

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop ...
876224ab
```
Conflicts:
	views
```
by happyhour7
2015-04-28 18:08:55 +0800
Browse Files
一级菜单提交
12c85a6c

by happyhour7
2015-04-28 18:07:29 +0800
Browse Files
数据格式微调，添加关于我们相关页面
04f9b2b5

by lore-w
2015-04-28 17:03:24 +0800
Browse Files
数据格式微调，添加关于我们相关页面
9bbbe4d9

by lore-w
2015-04-28 17:02:59 +0800
Browse Files
write页面数据格式更新
16d31a49

by happyhour7
2015-04-28 14:38:09 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop
07b878a0

by happyhour7
2015-04-28 13:49:17 +0800
Browse Files
矮导航、简繁体页头页尾以及writer页面提交
d27773dd

by happyhour7
2015-04-28 13:49:09 +0800
Browse Files

27 Apr, 2015

7 commits

Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-views into develop
5ec3e24a

by lore-w
2015-04-27 17:01:40 +0800
Browse Files
编辑页修改，导航条修改
a421c6b6

by lore-w
2015-04-27 17:01:29 +0800
Browse Files
数据格式更新
b04c4e34

by happyhour7
2015-04-27 16:48:21 +0800
Browse Files
数据格式更新
067fd64d

by happyhour7
2015-04-27 16:45:52 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop ...
79ce8a3f
```
Conflicts:
	mvc-config.json
```
by happyhour7
2015-04-27 16:43:51 +0800
Browse Files
首页、频道页、搜索页分辨率自适应开发完成
43b195c9

by happyhour7
2015-04-27 16:42:08 +0800
Browse Files
detail ajax数据格式上传
62adaff9

by 2586703@qq.com
2015-04-27 10:40:01 +0800
Browse Files

24 Apr, 2015

17 commits

添加数据格式说明文档
dcd6fc8e

by lore-w
2015-04-24 18:57:50 +0800
Browse Files
添加数据格式说明文档
f542810b

by lore-w
2015-04-24 18:57:02 +0800
Browse Files
4-24代码提交
b7d3662f

by 2586703@qq.com
2015-04-24 16:46:48 +0800
Browse Files
writer页面数据格式备注上传
5d847bec

by happyhour7
2015-04-24 16:02:13 +0800
Browse Files
文件结构更新
893a9a07

by happyhour7
2015-04-24 15:35:29 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop ...
5f765639
```
Conflicts:
	views
```
by happyhour7
2015-04-24 14:57:56 +0800
Browse Files
前端文件组织形式调整
885e84e7

by happyhour7
2015-04-24 14:55:55 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop
cc0be627

by 2586703@qq.com
2015-04-24 14:55:06 +0800
Browse Files
Merge branch 'ly_develop' into develop
4509520c

by 2586703@qq.com
2015-04-24 14:54:59 +0800
Browse Files
detail 数据修改
7d175f02

by 2586703@qq.com
2015-04-24 14:54:50 +0800
Browse Files
频道页面模板整合以及基础js交互
361417f2

by lore-w
2015-04-24 14:27:28 +0800
Browse Files
频道页面模板整合以及基础js交互
3a9e15c1

by lore-w
2015-04-24 14:24:30 +0800
Browse Files
banner多张图、但张图适配
cf6d9a08

by happyhour7
2015-04-24 11:13:57 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop
60404fc8

by happyhour7
2015-04-24 11:00:23 +0800
Browse Files
首页pop模板上传
5e8071c7

by happyhour7
2015-04-24 10:59:38 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-views into develop
c51c0010

by lore-w
2015-04-24 10:44:22 +0800
Browse Files
合并代码
4824d4a5

by lore-w
2015-04-24 10:44:13 +0800
Browse Files

23 Apr, 2015

2 commits

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop
6ccde1f0

by happyhour7
2015-04-23 18:14:07 +0800
Browse Files
search页面交互完成
bba3af8b

by happyhour7
2015-04-23 18:14:00 +0800
Browse Files