 wanglinchun
|
9c0f06bbc2
|
修改参赛作品页面部分显示方式
|
2014-05-08 19:10:38 +08:00 |
xianbo
|
2dc476018c
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-08 19:07:48 +08:00 |
|
wanglinchun
|
3edb1114c3
|
修改参赛作品列表页面的部分显示方式
|
2014-05-08 19:05:51 +08:00 |
|
wanglinchun
|
4696bcf40c
|
修改竞赛列表参赛作品数量
|
2014-05-08 19:00:54 +08:00 |
|
wanglinchun
|
b1041d1395
|
修改了竞赛列表页面中参赛作品的数量
|
2014-05-08 18:58:33 +08:00 |
|
wanglinchun
|
5c04f91857
|
修改了竞赛页面中关注人数的统计
|
2014-05-08 18:46:49 +08:00 |
yanxd
|
c2284deaf7
|
application.css 分页css问题
|
2014-05-08 18:40:10 +08:00 |
|
wanglinchun
|
caff0f55c9
|
调整了竞赛页面中参赛作品数量统计及跳转
|
2014-05-08 18:38:09 +08:00 |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
2014-05-08 18:15:58 +08:00 |
 nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
2014-05-08 18:03:48 +08:00 |
|
nwb
|
b94bd99311
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-08 18:00:58 +08:00 |
 z9hang
|
268dc1acce
|
主页讨论吧动态前显示吧名
|
2014-05-08 17:37:38 +08:00 |
|
wanglinchun
|
d686e105a5
|
调整关联作品框显示宽度
|
2014-05-08 17:10:17 +08:00 |
ganyiang
|
2048ce3c10
|
修复高校列表在firefox下显示不正常问题
|
2014-05-08 16:51:45 +08:00 |
|
wanglinchun
|
538f8516b0
|
目前已经通过判断将属于竞赛的项目或是应用显示到我要参赛的作品列表中
|
2014-05-08 16:49:52 +08:00 |
|
z9hang
|
3caedbdb85
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-08 15:52:28 +08:00 |
 yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
2014-05-08 15:27:16 +08:00 |
|
wanglinchun
|
f2dbbc48fc
|
发布作品和关联作品都可以用了，参赛应用也可以取出来了，接下来通过判断来去参赛项目和参赛应用
|
2014-05-08 15:06:36 +08:00 |
 kg
|
57e5cda513
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-08 14:26:27 +08:00 |
|
kg
|
db2ab5b945
|
modify issue filter and base_footer
|
2014-05-08 14:18:42 +08:00 |
|
ganyiang
|
5e780e6872
|
修复新建问题中autocomplete在Firefox下的不正常
|
2014-05-08 12:18:05 +08:00 |
|
wanglinchun
|
fb3c513da2
|
给“我要参赛”应用了base——newcontest的整体样式
|
2014-05-08 09:30:52 +08:00 |
|
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
2014-05-08 08:33:03 +08:00 |
|
ganyiang
|
786481e144
|
新建问题-主题-autocomplete-选中跳转
|
2014-05-07 20:30:42 +08:00 |
|
nwb
|
faab40456a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-07 19:45:11 +08:00 |
|
z9hang
|
e441657e23
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-07 15:23:12 +08:00 |
|
yanxd
|
8770599352
|
css typo
|
2014-05-07 10:58:49 +08:00 |
|
z9hang
|
a5f7a19f48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-07 10:04:48 +08:00 |
 fanqiang
|
9b151567f1
|
修改没有帮助显示问题
|
2014-05-07 08:16:25 +08:00 |
|
wanglinchun
|
1471d78e63
|
修改应用列表页面中每个应用右边三行的行间距
|
2014-05-07 08:13:08 +08:00 |
|
yanxd
|
eb19b0cb1f
|
welcome css改标点错误
|
2014-05-06 17:14:36 +08:00 |
|
yanxd
|
05baffe4f3
|
issue导航，首页贴吧动态html,加入了最后回复
|
2014-05-06 17:04:24 +08:00 |
|
wanglinchun
|
bb3c7f2432
|
修改了应用列表页面所属竞赛的显示长度
|
2014-05-06 16:01:22 +08:00 |
Wen
|
e8247b6edd
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-06 15:16:13 +08:00 |
|
Wen
|
d94e15cd94
|
用户打分
|
2014-05-06 15:15:29 +08:00 |
|
z9hang
|
f8c61ac69b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-06 10:36:59 +08:00 |
|
yanxd
|
f8746d6812
|
access control：关闭课程in view
|
2014-05-06 09:26:48 +08:00 |
|
yanxd
|
d257f4e853
|
随便关闭课程禁止//临时
|
2014-05-06 09:16:48 +08:00 |
|
wanglinchun
|
31dff76b3a
|
修改了首页竞赛中包含的app的字体的大小
|
2014-05-06 08:55:48 +08:00 |
|
z9hang
|
0af034eac6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-05 15:46:44 +08:00 |
|
fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
2014-05-05 15:33:24 +08:00 |
|
xianbo
|
0a6fc56dea
|
Merge branch 'master' of 10.0.47.245:/home/trustie2
|
2014-05-05 10:24:14 +08:00 |
|
xianbo
|
7255627924
|
Merge branch 'master' of 10.0.47.245:/home/trustie2
|
2014-05-05 10:23:31 +08:00 |
 huangjingquan
|
dc4e928741
|
修改tag显示异常
|
2014-05-05 10:17:50 +08:00 |
|
wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
2014-05-05 10:05:10 +08:00 |
|
Wen
|
501b491363
|
=.=
|
2014-05-05 10:03:13 +08:00 |
|
wanglinchun
|
c6576c71bf
|
增加了每个app打分的总人数
|
2014-05-05 10:01:08 +08:00 |
|
fanqiang
|
d50b2a9cfe
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-05 09:16:19 +08:00 |
|
fanqiang
|
e89d74e2a9
|
开源项目中新增tag，搜索查找待新增tag的obj
|
2014-05-05 09:15:55 +08:00 |
|
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
2014-05-05 09:11:59 +08:00 |