ued / yohogirls_mustache · Commits

22 May, 2015

7 commits

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
05724819

by lore-w
2015-05-22 13:55:35 +0800
Browse Files
video频道副标题bug
683decf0

by lore-w
2015-05-22 13:55:30 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into develop
7efa3bde

by happyhour7@163.com
2015-05-22 11:30:57 +0800
Browse Files
解决首页繁体模板错误
58846b6d

by lore-w
2015-05-22 11:17:04 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into develop
0061657f

by happyhour7@163.com
2015-05-22 11:04:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
2c8cd43f

by lore-w
2015-05-22 11:04:18 +0800
Browse Files
测试bug
229c172a

by lore-w
2015-05-22 11:04:12 +0800
Browse Files

21 May, 2015

29 commits

Merge branch 'develop' into test
a0d8f5cb

by happyhour7@163.com
2015-05-21 20:49:18 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into develop
1608241c

by happyhour7@163.com
2015-05-21 20:46:31 +0800
Browse Files
关于我们页面信息修改
4c0a6161

by lore-w
2015-05-21 20:44:52 +0800
Browse Files
关于我们页面信息修改
bbbcd4a6

by lore-w
2015-05-21 20:43:44 +0800
Browse Files
删除多出来的sports
39344118

by happyhour7@163.com
2015-05-21 20:42:20 +0800
Browse Files
Merge branch 'develop' into test
6f425a93

by happyhour7@163.com
2015-05-21 19:47:34 +0800
Browse Files
Merge branch 'web_develop' into develop
e8fb9dce

by happyhour7@163.com
2015-05-21 19:47:08 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into develop ...
07076cd6
```
Conflicts:
	partials/common/third_login320.html
```
by happyhour7@163.com
2015-05-21 19:46:30 +0800
Browse Files
detail qr修改
9c333078

by 2586703@qq.com
2015-05-21 19:05:32 +0800
Browse Files
最新模板上传
e3023da0

by happyhour7@163.com
2015-05-21 18:10:19 +0800
Browse Files
页脚添加统计代码，隐私条款，关于我们在app中只需要body部分
53d9e0a2

by lore-w
2015-05-21 18:09:00 +0800
Browse Files
把静态资源的引用方式改为可配置、magazine页面去掉下载按钮
2701efe1

by lore-w
2015-05-21 17:44:29 +0800
Browse Files
最新模板上传
3a1a2751

by happyhour7@163.com
2015-05-21 17:35:41 +0800
Browse Files
最新模板上传
5c85d937

by happyhour7@163.com
2015-05-21 17:33:33 +0800
Browse Files
图片及flash路径修改
0ab7044b

by 2586703@qq.com
2015-05-21 16:05:45 +0800
Browse Files
解决BUG5440
a9bc01cb

by happyhour7@163.com
2015-05-21 15:51:29 +0800
Browse Files
最新结果上传
2a8151ee

by happyhour7@163.com
2015-05-21 15:33:59 +0800
Browse Files
搜索页面上传
c21b79be

by happyhour7@163.com
2015-05-21 15:30:01 +0800
Browse Files
Merge branch 'web_develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into web_develop ...
216f5b7c
```
Conflicts:
	partials/common/environment_images.html
```
by 2586703@qq.com
2015-05-21 14:40:03 +0800
Browse Files
模板修改
aed18f59

by 2586703@qq.com
2015-05-21 14:38:03 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:ued/yohogirls-mustache into test
47de3623

by happyhour7@163.com
2015-05-21 14:20:16 +0800
Browse Files
Merge branch 'web_develop' into test
b5429535

by happyhour7@163.com
2015-05-21 14:20:00 +0800
Browse Files
后台追加环境变量
8689d020

by happyhour7@163.com
2015-05-21 14:06:46 +0800
Browse Files
修正BUG5437
ad10b261

by happyhour7@163.com
2015-05-21 14:04:37 +0800
Browse Files
Merge branch 'web_develop' of git.dev.yoho.cn:ued/yohogirls-mustache into web_develop
3ab83134

by happyhour7@163.com
2015-05-21 13:44:33 +0800
Browse Files
最新模板上传
68d815ea

by happyhour7@163.com
2015-05-21 13:44:26 +0800
Browse Files
Merge branch 'develop' into test
0f0efc9e

by hf
2015-05-21 11:30:41 +0800
Browse Files
fixes bug refs YBG-5168 集团导航在新页面打开
8129cdc9

by hf
2015-05-21 10:19:16 +0800
Browse Files
静态资源路径适配及友情链接修改
42d6a934

by 2586703@qq.com
2015-05-21 10:07:57 +0800
Browse Files

20 May, 2015

4 commits

Merge branch 'develop' into test
2105425d

by hf
2015-05-20 19:38:01 +0800
Browse Files
modify to remove home partials template
626a5e1a

by hf
2015-05-20 19:37:35 +0800
Browse Files
Merge branch 'develop' into test
d6d14fb3

by hf
2015-05-20 19:34:01 +0800
Browse Files
合并并修改首页及频道页的数据结构，减化资讯内容渲染逻辑到公共的子模板(partials)中;增加百度谷歌统计代码并对模板页面的A链接增加公共的事件跟踪代码.
d6d86538

by hf
2015-05-20 19:33:22 +0800
Browse Files