 sw
|
64900b1fd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
11 years ago |
 nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
11 years ago |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
11 years ago |
|
sw
|
b97c2e230f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
74a9aa14d6
|
增加获取学校列表按学校开设课程数排序的方法
增加当当前学校开设课程数目为0时按照上方法推荐其进入其他学校查看课程
|
11 years ago |
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
11 years ago |
 fanqiang
|
9b151567f1
|
修改没有帮助显示问题
|
11 years ago |
 yanxd
|
05baffe4f3
|
issue导航，首页贴吧动态html,加入了最后回复
|
11 years ago |
Wen
|
501b491363
|
=.=
|
11 years ago |
|
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
|
11 years ago |
|
Wen
|
90b53a7efb
|
打分的调整
|
11 years ago |
|
Wen
|
040e4b2740
|
用户打分.
|
11 years ago |
 wanglinchun
|
3da6d5cd37
|
应用页面列表排序（按时间排序已好，另一种排序暂未定）
|
11 years ago |
|
wanglinchun
|
b542f8072d
|
调整竞赛列表页面中的排序问题
|
11 years ago |
|
fanqiang
|
07b75924d8
|
修改tag搜索，使得tag搜索能够搜索开源项目
在帖子展示页面添加时间，并添加标签
|
11 years ago |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
9038f2758c
|
根据将旧的竞赛信息和参与竞赛的项目信息迁移到新的竞赛相关数据表后重新调整竞赛子站首页最新热门竞赛的显示
|
11 years ago |
|
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
11 years ago |
 kg
|
77ea0092b7
|
add course homepage activity
|
11 years ago |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
11 years ago |
|
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
11 years ago |
|
fanqiang
|
91d5959016
|
添加了对管理员申请的接受与拒绝
|
11 years ago |
|
Wen
|
ded3da6670
|
用户评分理论上完成了
|
11 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
11 years ago |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
11 years ago |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
11 years ago |
 baiyu
|
f0b497e455
|
user score merge
|
11 years ago |
|
baiyu
|
36cd91401f
|
user score
|
11 years ago |
|
fanqiang
|
8600265f00
|
修改查询条件样式
|
11 years ago |
xianbo
|
bb4d141b0e
|
erge branch 'competition' into develop
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
11 years ago |
|
wanglinchun
|
43064c4bc2
|
调整竞赛模块首页中显示的竞赛：既有旧的竞赛又有新的竞赛
|
11 years ago |
|
xianbo
|
647081539c
|
fix
|
11 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
11 years ago |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
11 years ago |
 alan
|
f6a1e90ad1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
wanglinchun
|
3a5b5bc0ce
|
设计并调整竞赛模块的首页显示样式
|
11 years ago |
|
yanxd
|
84d3e40c41
|
zip down controller created
|
11 years ago |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
11 years ago |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
11 years ago |
|
alan
|
933fc6cb33
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
alan
|
7781203474
|
附件按tag查询时，只查选定项目中的附件
|
11 years ago |
|
wanglinchun
|
f9e5dd47f6
|
修改了竞赛列表的排序问题
|
11 years ago |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
11 years ago |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
11 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
11 years ago |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
11 years ago |
