ued / yohogirls-views · Commits

04 May, 2015

3 commits

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop ...
f9ce5bd4
```
Conflicts:
	mvc-config-wangwei/mvc-config-editor.json
```
by happyhour7
2015-05-04 11:37:08 +0800
Browse Files
最新模板上传
ce1279d2

by happyhour7
2015-05-04 11:36:27 +0800
Browse Files
最新测试配置文件上传
e99a822a

by happyhour7
2015-05-04 11:08:33 +0800
Browse Files

30 Apr, 2015

5 commits

前后台统一，调整数据格式
88704dcd

by lore-w
2015-04-30 16:39:07 +0800
Browse Files
前后台统一，调整数据格式
da2dd076

by lore-w
2015-04-30 16:38:21 +0800
Browse Files
edit数据修改
123b4232

by 2586703@qq.com
2015-04-30 15:40:30 +0800
Browse Files
detail数据修改
22c7e183

by 2586703@qq.com
2015-04-30 11:25:17 +0800
Browse Files
about magazine detail数据修改
849ae85a

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

29 Apr, 2015

17 commits

数据修改
bb64929f

by 2586703@qq.com
2015-04-29 16:07:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into ly_develop
c19f52ff

by 2586703@qq.com
2015-04-29 15:44:05 +0800
Browse Files
detail页数据说明
7ed62e3f

by 2586703@qq.com
2015-04-29 15:43:57 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop
e5ecf220

by 2586703@qq.com
2015-04-29 15:42:55 +0800
Browse Files
detail 翻转，变脸数据修改
2c846772

by 2586703@qq.com
2015-04-29 15:42:49 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop ...
f468dca1
```
Conflicts:
	views
```
by happyhour7
2015-04-29 15:36:41 +0800
Browse Files
tag页面标签文本模板确实BUG修正，数据格式说明
f1adfca5

by happyhour7
2015-04-29 15:35:01 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into ly_develop ...
bddc8d74
```
冲突调试
Conflicts:
	mvc-config.json
```
by 2586703@qq.com
2015-04-29 15:16:52 +0800
Browse Files
about数据
27d504c6

by 2586703@qq.com
2015-04-29 15:15:47 +0800
Browse Files
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
detail数据及数据格式说明
5f244fbb

by 2586703@qq.com
2015-04-29 13:30:47 +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

8 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
magazine数据修改
eb8435e4

by 2586703@qq.com
2015-04-28 17:52:22 +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