ued / yohogirls-frontend · Commits

Create Merge Request

10 Aug, 2015

2 commits

magazine.js
da5f49e7

by 2586703@qq.com
2015-08-10 11:09:22 +0800
Browse Files
e-zine js 修改
85bc8748

by 2586703@qq.com
2015-08-10 10:59:07 +0800
Browse Files

04 May, 2015

28 commits

登录及seajs resUrl配置修改
08462ef3

by 2586703@qq.com
2015-05-04 18:42:03 +0800
Browse Files
detail 第三方登录
4c7bc913

by 2586703@qq.com
2015-05-04 18:35:17 +0800
Browse Files
detail css login js修改
61d796e6

by 2586703@qq.com
2015-05-04 18:19:59 +0800
Browse Files
detail相关js css修改
9dcd59c2

by 2586703@qq.com
2015-05-04 17:44:35 +0800
Browse Files
评论插件修改
0005336c

by 2586703@qq.com
2015-05-04 17:11:41 +0800
Browse Files
评论插件修改
80fbbc98

by 2586703@qq.com
2015-05-04 16:32:11 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-frontend into develop ...
edf4aef5
```
调试seajs冲突
Conflicts:
	web/js/util/seajs.js
```
by 2586703@qq.com
2015-05-04 15:09:24 +0800
Browse Files
photoslide 依赖修改
61369049

by 2586703@qq.com
2015-05-04 15:08:44 +0800
Browse Files
最新文件上传
b4b2bfe5

by happyhour7
2015-05-04 15:06:08 +0800
Browse Files
最新代码上传
f6059af7

by happyhour7
2015-05-04 14:56:00 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-frontend into develop ...
50254f51
```
Conflicts:
	web/js/public.js
```
by happyhour7
2015-05-04 13:23:06 +0800
Browse Files
最新代码上传
94941013

by happyhour7
2015-05-04 13:22:05 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-frontend into develop
4709ffe6

by lore-w
2015-05-04 13:12:54 +0800
Browse Files
girl mobile 详情页变脸、翻转、轮播图实现
73f4c687

by lore-w
2015-05-04 13:12:39 +0800
Browse Files
评论及登录 ajax修改
60644c62

by 2586703@qq.com
2015-05-04 11:56:53 +0800
Browse Files
登录ajax修改
4ab6e303

by 2586703@qq.com
2015-05-04 11:54:27 +0800
Browse Files
评论ajax修改
f5e2dc47

by 2586703@qq.com
2015-05-04 11:53:33 +0800
Browse Files
态度 js ajax修改
c8910846

by 2586703@qq.com
2015-05-04 11:45:34 +0800
Browse Files
detail 态度js修改
de80d926

by 2586703@qq.com
2015-05-04 11:41:52 +0800
Browse Files
detail js css修改
b0a54377

by 2586703@qq.com
2015-05-04 11:37:12 +0800
Browse Files
最新JS上传
5a0b9d36

by happyhour7
2015-05-04 11:17:45 +0800
Browse Files
最新代码上传
a2b4734c

by happyhour7
2015-05-04 11:05:08 +0800
Browse Files
最新样式长传
c7a2dfab

by happyhour7
2015-05-04 10:58:39 +0800
Browse Files
冲突控制上传
111a1cd0

by happyhour7
2015-05-04 10:54:57 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-frontend into develop ...
5f3652f3
```
Conflicts:
	web/js/util/seajs.js
	web/package.json
```
by happyhour7
2015-05-04 10:53:42 +0800
Browse Files
样式更改
511ecb23

by happyhour7
2015-05-04 10:52:39 +0800
Browse Files
phptpslide插件依赖上传
1d6dd7c0

by 2586703@qq.com
2015-05-04 10:23:46 +0800
Browse Files
detail scss修改
ccd6cbfc

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

30 Apr, 2015

4 commits

4-30 css js代码上传
21af80b9

by 2586703@qq.com
2015-04-30 15:41:59 +0800
Browse Files
detail样式
2edd171f

by 2586703@qq.com
2015-04-30 11:19:40 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-frontend into ly_develop ...
f3241c00
```
调试冲突
Conflicts:
	web/package.json
```
by 2586703@qq.com
2015-04-30 10:55:01 +0800
Browse Files
分享评论相关js,图片，样式
742c7754

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

29 Apr, 2015

6 commits

tag页面BUG修正
7a876de4

by happyhour7
2015-04-29 15:39:20 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-frontend into develop ...
41d82794
```
Conflicts:
	web/js/public.js
```
by happyhour7
2015-04-29 15:12:30 +0800
Browse Files
video频道二级导航完成
f1fb1383

by happyhour7
2015-04-29 15:11:29 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-frontend into develop
8c5dc860

by lore-w
2015-04-29 14:20:47 +0800
Browse Files
spm build
591497ed

by lore-w
2015-04-29 14:20:34 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-frontend into develop ...
f8e99d45
```
冲突调试
Conflicts:
	web/js/public.js
	web/package.json
```
by 2586703@qq.com
2015-04-29 13:29:47 +0800
Browse Files