ued / yohogirls_mustache · Commits

06 May, 2015

21 commits

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

by lore-w
2015-05-06 14:48:27 +0800
Browse Files
调整js引用方式
d04640ee

by lore-w
2015-05-06 14:47:52 +0800
Browse Files
解决web layout_header冲突
495d5922

by lore-w
2015-05-06 14:26:07 +0800
Browse Files
解决web layout_header冲突
06997be8

by lore-w
2015-05-06 14:25:22 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
ba48544b

by lore-w
2015-05-06 14:23:00 +0800
Browse Files
标签聚合页、编辑聚合页模板修改，意见反馈js修改
5a462e4a

by lore-w
2015-05-06 14:22:54 +0800
Browse Files
Merge branch 'develop' into test
dea0445f

by happyhour7@163.com
2015-05-06 11:37:40 +0800
Browse Files
修复BUG4913
a2a2fa07

by happyhour7@163.com
2015-05-06 11:37:26 +0800
Browse Files
修复BUG4913
db9c0f48

by happyhour7@163.com
2015-05-06 11:35:53 +0800
Browse Files
Merge branch 'develop' into test
7e5c8a03

by happyhour7@163.com
2015-05-06 11:09:54 +0800
Browse Files
解决BUG4914
c361e66d

by happyhour7@163.com
2015-05-06 11:08:35 +0800
Browse Files
修改BUG单4909
34f2c965

by happyhour7@163.com
2015-05-06 10:35:06 +0800
Browse Directory »
解决BUG单4909
e7407b3c

by happyhour7@163.com
2015-05-06 10:33:00 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:ued/yohogirls-mustache into test
6eb800ce

by happyhour7@163.com
2015-05-06 10:14:13 +0800
Browse Files
Merge branch 'develop' into test
5b480920

by happyhour7@163.com
2015-05-06 10:13:41 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into develop
86b24ee6

by happyhour7@163.com
2015-05-06 10:13:01 +0800
Browse Files
Merge branch 'develop' into test
e7ed9a67

by 2586703@qq.com
2015-05-06 10:12:46 +0800
Browse Files
detail-title模板修改
3d060a40

by 2586703@qq.com
2015-05-06 10:11:23 +0800
Browse Files
最新代码上传
c08517b8

by happyhour7@163.com
2015-05-06 10:08:33 +0800
Browse Files
Merge branch 'develop' into test
97614fdb

by 2586703@qq.com
2015-05-06 10:02:34 +0800
Browse Files
detail时间模板修改
359b6bf5

by 2586703@qq.com
2015-05-06 09:57:19 +0800
Browse Files

05 May, 2015

19 commits

Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into test
1471602f

by lore-w
2015-05-05 18:25:34 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
31eadebf

by lore-w
2015-05-05 18:25:02 +0800
Browse Files
详情页logo修改、搜索功能修改
85874328

by lore-w
2015-05-05 18:24:57 +0800
Browse Files
girl web footer_jian冲突解决
4216d7ad

by lore-w
2015-05-05 18:23:27 +0800
Browse Files
详情页logo修改、搜索功能修改
65a18d99

by lore-w
2015-05-05 18:22:38 +0800
Browse Files
detail_title模板修改
1f287a2d

by 2586703@qq.com
2015-05-05 18:07:11 +0800
Browse Files
Merge branch 'develop' into test ...
0e469e7b
```
调试冲突
Conflicts:
	partials/layout/footer_jian.html
```
by 2586703@qq.com
2015-05-05 18:00:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
180f9c12

by 2586703@qq.com
2015-05-05 17:58:10 +0800
Browse Files
detail-title模板修改
43ea2916

by 2586703@qq.com
2015-05-05 17:58:04 +0800
Browse Files
Merge branch 'develop' into test
ea000b10

by happyhour7@163.com
2015-05-05 17:11:51 +0800
Browse Directory »
最新模板上传
db37fc86

by happyhour7@163.com
2015-05-05 17:10:36 +0800
Browse Files
最新模板上传
6f57d876

by happyhour7@163.com
2015-05-05 17:00:32 +0800
Browse Directory »
模板上传
0d779f6f

by happyhour7@163.com
2015-05-05 16:58:49 +0800
Browse Directory »
最新代码上传
9cf8eb11

by happyhour7@163.com
2015-05-05 16:56:41 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:ued/yohogirls-mustache into test
4eb1007b

by happyhour7@163.com
2015-05-05 16:52:59 +0800
Browse Files
最新模板上传
d2bff461

by happyhour7@163.com
2015-05-05 16:47:14 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:ued/yohogirls-mustache into test
9b35fb82

by 2586703@qq.com
2015-05-05 16:37:32 +0800
Browse Files
Merge branch 'develop' into test
26fc3a11

by 2586703@qq.com
2015-05-05 16:37:11 +0800
Browse Files
Merge branch 'test' of git.dev.yoho.cn:ued/yohogirls-mustache into test
5e122ce6

by happyhour7@163.com
2015-05-05 16:32:57 +0800
Browse Files