ued / yohogirls-views · Commits

21 Apr, 2015

20 commits

去除所有模板，替换为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
合并王成龙代码
88cbcd51

by happyhour7
2015-04-21 16:13:22 +0800
Browse Files
目录更改，迁移文件
04b0ee09

by lore-w
2015-04-21 14:09:47 +0800
Browse Files
目录更改，迁移文件
f836fa71

by lore-w
2015-04-21 13:56:52 +0800
Browse Files
目录更改，迁移文件
fca4037a

by lore-w
2015-04-21 13:54:47 +0800
Browse Files
数据格式说明文件
9de2d4dc

by happyhour7
2015-04-21 13:51:35 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-views into develop
58eab64c

by happyhour7
2015-04-21 13:49:31 +0800
Browse Files
数据格式说明
0f97db06

by happyhour7
2015-04-21 13:48:10 +0800
Browse Files
解决冲突
f29887e5

by lore-w
2015-04-21 13:25:11 +0800
Browse Files
首页、频道页，1080分辨率下页面样式完成
4b78596e

by happyhour7
2015-04-21 13:14:20 +0800
Browse Files
合并远程与本地代码，解决冲突
4ae39c7b

by lore-w
2015-04-21 11:50:10 +0800
Browse Files
view子模块提交
7a2acc4a

by happyhour7
2015-04-21 10:38:07 +0800
Browse Files
remove views to submodule yohogirls-mustache
e2ce39b0

by happyhour7
2015-04-21 10:15:02 +0800
Browse Files
目录调整
c1869434

by lore-w
2015-04-21 10:05:51 +0800
Browse Files
Merge branch 'local' into develop
5e300bdb

by lore-w
2015-04-21 10:02:25 +0800
Browse Files
目录调整
bae5ceeb

by lore-w
2015-04-21 10:01:43 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/newgirlviews into develop
a4fe6743

by happyhour7
2015-04-21 10:01:25 +0800
Browse Files
2015-4-21日git地址变更代码上传保存
2f39a000

by happyhour7
2015-04-21 10:01:06 +0800
Browse Files
评论html及数据上传
e8856968

by 2586703@qq.com
2015-04-21 10:00:36 +0800
Browse Files

20 Apr, 2015

16 commits

Merge branch 'develop' of http://git.dev.yoho.cn/ued/newgirlviews into develop
3284dac5

by 2586703@qq.com
2015-04-20 16:07:20 +0800
Browse Files
Merge branch 'ly_develop' into develop
efa2462e

by 2586703@qq.com
2015-04-20 16:07:13 +0800
Browse Files
04-20 16:00 代码提交
bf3bbce7

by 2586703@qq.com
2015-04-20 16:07:04 +0800
Browse Files
普通频道页、杂志页、内容详情页模板整合
d8d734f7

by happyhour7
2015-04-20 16:05:56 +0800
Browse Files
页面链接模板添加完成
2bc75c66

by happyhour7
2015-04-20 16:02:45 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/newgirlviews into develop
1ca92ce9

by 2586703@qq.com
2015-04-20 15:05:32 +0800
Browse Files
YJS install
924e4975

by 2586703@qq.com
2015-04-20 15:05:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/newgirlviews into develop ...
28167b96
```
Conflicts:
	package.json
```
by happyhour7
2015-04-20 15:05:01 +0800
Browse Files
各频道页不同样式、切图添加
103a581e

by happyhour7
2015-04-20 15:04:09 +0800
Browse Files
2015-04-20 15:00 代码提交
d300b1fc

by 2586703@qq.com
2015-04-20 15:02:29 +0800
Browse Files
Merge branch 'ly_develop' into develop
e075aac2

by 2586703@qq.com
2015-04-20 13:27:36 +0800
Browse Files
detail数据修改
be33d490

by 2586703@qq.com
2015-04-20 13:27:29 +0800
Browse Files
懒加载图片html修改
0fc21761

by 2586703@qq.com
2015-04-20 13:26:10 +0800
Browse Files
完成杂志页面模板
4a9ecdd9

by lore-w
2015-04-20 13:14:29 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/newgirlviews into develop
26cabb9e

by 2586703@qq.com
2015-04-20 09:26:00 +0800
Browse Files
about页及404页 html代码
1d532e65

by 2586703@qq.com
2015-04-20 09:25:54 +0800
Browse Files

17 Apr, 2015

1 commit

Merge branch 'develop' into local
fdfb974d

by lore-w
2015-04-17 09:59:45 +0800
Browse Files

16 Apr, 2015

3 commits

Merge branch 'develop' of http://git.dev.yoho.cn/ued/newgirlviews into develop
9fa7857e

by happyhour7
2015-04-16 18:26:49 +0800
Browse Files
2015-4-16日工作文件提交
a9a09b8d

by happyhour7
2015-04-16 18:26:17 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/newgirlviews into develop ...
419a8366
```
调试冲突
Conflicts:
	mvc-config.json
```
by 2586703@qq.com
2015-04-16 18:18:19 +0800
Browse Files