ued / yohogirls-views · Commits

24 Apr, 2015

13 commits

4-24代码提交
b7d3662f

by 2586703@qq.com
2015-04-24 16:46:48 +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

14 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
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop
84f07e5d

by 2586703@qq.com
2015-04-23 17:35:22 +0800
Browse Files
ajax数据 04-23 17:33
dd1311a7

by 2586703@qq.com
2015-04-23 17:34:59 +0800
Browse Files
频道页交互开发完成
5f1a3f3b

by happyhour7
2015-04-23 16:57:06 +0800
Browse Files
首页交互开发完成
135c52f7

by happyhour7
2015-04-23 16:20:10 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-views into develop
436d12d9

by lore-w
2015-04-23 11:32:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop ...
4f76ba3f
```
Conflicts:
	views
```
by happyhour7
2015-04-23 11:32:28 +0800
Browse Files
JS引用模板上传
27748c1d

by happyhour7
2015-04-23 11:31:39 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-views into develop
2d60c74c

by lore-w
2015-04-23 11:30:21 +0800
Browse Files
04 23 10:00 代码提交
88dec663

by 2586703@qq.com
2015-04-23 09:59:34 +0800
Browse Files
04 23 10:00 代码提交
4da138b4

by 2586703@qq.com
2015-04-23 09:56:22 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-views into develop
65a1a927

by lore-w
2015-04-23 09:32:20 +0800
Browse Files
同步js配置
c32faa59

by lore-w
2015-04-23 09:32:02 +0800
Browse Files

22 Apr, 2015

9 commits

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

by happyhour7
2015-04-22 18:55:51 +0800
Browse Files
JS开发方式确定
e92e9f2e

by happyhour7
2015-04-22 18:54:52 +0800
Browse Files
将模板页转业到layout目录
e3593224

by happyhour7
2015-04-22 17:27:03 +0800
Browse Files
magazine 相关json html上传
49a0bb8f

by 2586703@qq.com
2015-04-22 17:26:49 +0800
Browse Files
模板页高导航样式定稿
54b12668

by happyhour7
2015-04-22 17:13:59 +0800
Browse Files
解决p配置文件冲突
36eaaec4

by lore-w
2015-04-22 09:35:42 +0800
Browse Files
完成静态页面
fbbd1633

by lore-w
2015-04-22 09:33:07 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop
cfbbfd74

by happyhour7
2015-04-22 09:33:01 +0800
Browse Files
将模板替换为partials
a0c0e343

by happyhour7
2015-04-22 09:31:33 +0800
Browse Files

21 Apr, 2015

4 commits

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

by 2586703@qq.com
2015-04-21 17:59:45 +0800
Browse Files
2015-04-21 代码提交
5097fe05

by 2586703@qq.com
2015-04-21 17:59:39 +0800
Browse Files
去除所有模板，替换为partials
56124dd2

by happyhour7
2015-04-21 17:20:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop ...
ff4842d1
```
Conflicts:
	mvc-config.json
	views
```
by happyhour7
2015-04-21 16:14:56 +0800
Browse Files