 sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
|
11 years ago |
 yanxd
|
f44b930037
|
233
|
11 years ago |
 nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
11 years ago |
|
yanxd
|
34aa8433de
|
import hubspot
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
 fanqiang
|
973a59042c
|
修改帖子显示用户名与链接问题
|
11 years ago |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
11 years ago |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
sw
|
c141501085
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
yanxd
|
9373666576
|
混淆课程数量
|
11 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
11 years ago |
|
sw
|
14a468066f
|
修复打开首页，SQL没有默认的school_id的问题
|
11 years ago |
|
sw
|
7ead12dba6
|
1.优化路由代码
2.修改当查询学校课程数数量少于8个时，推荐9-当前学校课程数量门最好的课程给用户，并且排除当前学校课程
|
11 years ago |
 wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
 z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
11 years ago |
|
fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
11 years ago |
|
yanxd
|
665a17eda5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
yanxd
|
829c77879a
|
typo
|
11 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
11 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
11 years ago |
|
z9hang
|
fcc5f220ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
11 years ago |
|
z9hang
|
73dcf3679d
|
去除课程、项目配置中的讨论区配置
|
11 years ago |
|
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 |
