 nwb
|
fb0597ab4a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
11 years ago |
yanxd
|
e1d9d6ab45
|
tag查询崩溃
|
11 years ago |
xianbo
|
830e2d4fb4
|
隐藏 站长统计
|
11 years ago |
 sw
|
063460f119
|
tt
|
11 years ago |
 z9hang
|
cc2862ae0f
|
修正缺陷不能踩自己提示错误
|
11 years ago |
|
z9hang
|
8b0f155be7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d34ab220cc
|
登录名区分大小写
|
11 years ago |
|
nwb
|
138211efba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e94ed86ead
|
部分BUG修正
|
11 years ago |
|
z9hang
|
2e38f66899
|
搜索用户修改为按昵称搜索
|
11 years ago |
|
z9hang
|
a7fa444f9e
|
修正项目个人得分问题：统计时只计算项目成员，user_grade表user_id和project_id联合不重复验证，user_grade分数部位负验证
|
11 years ago |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
11 years ago |
|
z9hang
|
0f9c098df9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
0bcc0beaf1
|
修复留言计分
|
11 years ago |
|
sw
|
12b6525cc6
|
t
|
11 years ago |
|
sw
|
bb86ef4612
|
修复获取作业列表时课程老师参数获取不正确的问题
|
11 years ago |
|
sw
|
bc434a82a4
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
33c883146a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
4906bad7d2
|
修正进项目报错异常
|
11 years ago |
|
sw
|
98d2c144ae
|
修改时间排序为升序排序
|
11 years ago |
|
nwb
|
671eaa8d45
|
测试
|
11 years ago |
|
sw
|
d03718e30f
|
修复新评分规则下按分数排序不正确的问题
|
11 years ago |
|
nwb
|
6141cc56e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e863c30352
|
部分BUG修正
|
11 years ago |
|
z9hang
|
9a8c5ebecc
|
个人得分规则显示
留言回复未加分bug修改
|
11 years ago |
|
sw
|
f6d9bfc91d
|
修改新建作业时传递参数
|
11 years ago |
|
sw
|
be2faea15b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/bids_controller.rb
app/views/courses/new_homework.html.erb
|
11 years ago |
 linchun
|
79f68c2231
|
Merge branch 'szzh' into develop
|
11 years ago |
|
nwb
|
25a3114a5a
|
老师的学生列表显示为真实姓名
|
11 years ago |
|
nwb
|
917288c84c
|
修正课程讨论区、课程通知等创建时BUG修正
|
11 years ago |
|
sw
|
3f8f141107
|
修复 创建作业时，由于输入参数错误导致保存失败后，再次输入错误参数会报错。如再次输入参数正确，会进入一个空白页面 的BUG
|
11 years ago |
|
nwb
|
99c9f81aea
|
BUG修正
|
11 years ago |
|
nwb
|
1a4ee62853
|
修正课程错误信息显示2遍的问题
|
11 years ago |
|
nwb
|
ad97066a45
|
课程名称有效性判断
|
11 years ago |
|
nwb
|
c0f0e294e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
beeab518e8
|
课程动态中留言链接BUG修复
|
11 years ago |
|
z9hang
|
0717148a0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
bc587f3e7d
|
屏蔽个人分数实时刷新功能
修复个人分数计分异常
|
11 years ago |
|
nwb
|
3565b9da88
|
修正用户课程界面关闭、重启课程，数据刷新不及时的问题
|
11 years ago |
|
sw
|
09d79ae4e0
|
添加作业增加默认日期为当前时间的下一天
|
11 years ago |
|
sw
|
745727b8e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d57688413e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
11 years ago |
|
sw
|
08bfb8e80a
|
修复教师评分后星星显示不正常的BUG
|
11 years ago |
|
nwb
|
33baf88886
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
38baa247bf
|
BUG修正
|
11 years ago |
|
sw
|
12b16f0bb6
|
1.修复作业界面点击所属任务链接出错的BUG
2.点击所属任务返回作业列表界面
|
11 years ago |
|
z9hang
|
2501f31ef1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
7399e1aca2
|
添加项目个人得分统计功能
|
11 years ago |
|
sw
|
392dc0c365
|
增加访问作业显示列表的权限
|
11 years ago |
|
sw
|
dbd5c49246
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
a115edea9d
|
修改课程标签页选中状态
|
11 years ago |
|
sw
|
ed9b97f987
|
增加访问作业显示列表的权限
|
11 years ago |
|
sw
|
56ce9e8bdb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c4b2c47dc7
|
调整作业显示样式
|
11 years ago |
|
sw
|
12087f40c7
|
1.当作业未选定项目时，项目得分为灰色的N/A，选定了项目，项目得分为橘色的分数
2.当无人对作业进行互评、综评时，作业的互评、综评得分为灰色的N/A，有人进行评分则为橘色的分数
3.简化代码
|
11 years ago |
|
nwb
|
b4af75f289
|
部分界面优化
|
11 years ago |
|
sw
|
7702b746c6
|
修复作业显示界面，提交作业按钮不显示的问题
|
11 years ago |
|
nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
11 years ago |
|
nwb
|
88c3347f7c
|
修正合并分支后的创建课程错误
|
11 years ago |
|
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
11 years ago |
|
z9hang
|
b04992b226
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
57cdb55282
|
修正get_level方法是用错误
仿照用户得分规则实现项目个人得分
|
11 years ago |
|
nwb
|
d5665c7bb7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
ae3457e68b
|
1.添加代码评审(CodeReview)插件
2.添加代码评审插件使用文档
|
11 years ago |
|
z9hang
|
02e221eedb
|
修改：网站中的旧分数显示为新分数
|
11 years ago |
|
nwb
|
6a2c486f62
|
修改作业数为10倍数时的显示BUG
|
11 years ago |
|
sw
|
c320ede205
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linchun
|
c1e780a0f8
|
yan
|
11 years ago |
|
linchun
|
0c501022fd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
z9hang
|
dc1bd010f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e367c03f6e
|
修正课程作业列表显示BUG
|
11 years ago |
|
z9hang
|
df89e5e173
|
去掉多的一个分数显示
|
11 years ago |
|
linchun
|
e602c0f149
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
nwb
|
ef61e41d48
|
去掉首页缓存
|
11 years ago |
|
linchun
|
9c5066b81c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
app/controllers/account_controller.rb
|
11 years ago |
|
sw
|
91408cc960
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
358d4a53b8
|
修复未公开项目动态仍在主页最新动态显示的问题
|
11 years ago |
|
z9hang
|
773b728828
|
修改：自己不能踩或顶自己
|
11 years ago |
|
sw
|
0dce86d47e
|
修改首页项目显示为按活跃度排名的前10个项目
|
11 years ago |
|
z9hang
|
f16bec924c
|
处理undefined method `update_user_level' for nil:NilClass问题
|
11 years ago |
|
z9hang
|
9d9bc76af4
|
定时刷新分数
|
11 years ago |
|
z9hang
|
24172c85c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
11 years ago |
|
sw
|
339b5b0296
|
缺陷编辑页面直接显示，不需要点击留言按钮才显示缺陷编辑页面
|
11 years ago |
|
sw
|
05659fa2db
|
修复注册后在”修改资料“中发现我在注册时选择的”学生“身份和地区信息以及学号信息都没有了，需要重新填写。
|
11 years ago |
|
z9hang
|
55b28296a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
54d4b957ee
|
修复竖排的踩顶图标在踩或顶完后变成横排问题
|
11 years ago |
|
sw
|
18762e2da7
|
增加、修改作业时提交项目增加空值选择，即不选定任何关联项目
|
11 years ago |
|
sw
|
d2376eb0b1
|
将页面部分jS代码转为JQuary代码
|
11 years ago |
|
sw
|
d0c9390e91
|
增加什么是项目链接。点击什么是项目 实现jQuary窗帘效果显示解释
|
11 years ago |
|
nwb
|
8cdab80d31
|
用户课程界面链接BUG修改
|
11 years ago |
|
sw
|
5277eddb95
|
封装获取一个作业参与人员方法
|
11 years ago |
|
nwb
|
6039cf63af
|
课程讨论区文件上传权限优化
|
11 years ago |
|
sw
|
600ec536b3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
989407dad2
|
12
|
11 years ago |
|
sw
|
09eae9e253
|
1.作业列表增加项目得分显示
2.封装获取指定项目得分的方法，并保留2位有效数字
|
11 years ago |
|
sw
|
36fecfc635
|
1.界面颜色调整
2.得分显示取消“分”字
|
11 years ago |
|
sw
|
19530df395
|
作业附件显示修改
|
11 years ago |
|
z9hang
|
2ee5b422fb
|
RolesController.rb移回app/controls
|
11 years ago |
|
sw
|
463edeee71
|
1.修复未开启互评功能作业总评得分计算不正确的问题
2.修复未选择项目新建、修改有误的BUG
|
11 years ago |
|
sw
|
e43a84ab4b
|
1.修复作业无关联项目是进入编辑界面报错的问题
2.修复作业综评页面不会及时更新的问题
|
11 years ago |
|
sw
|
59e6433938
|
修复获取当前用户建立项目不正确的问题
|
11 years ago |
|
z9hang
|
a764888055
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
31049fcf4e
|
修复同时更新缺陷状态和缺陷完成度时只有缺陷完成度加分及记录分数变化细节，缺陷状态更改操作未加分及记录分数变化细节bug
|
11 years ago |
|
sw
|
4d06d26303
|
优化新建作业页面显示
|
11 years ago |
|
sw
|
f3f303e6e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ef234d8c50
|
1.按照新的评分规则修改作业得分
2.修改作业列表显示界面
3.增加获取作业的互评得分、教师评分、最终评分方法
|
11 years ago |
|
nwb
|
0736dd1254
|
课程讨论区回复权限和界面BUG修正
|
11 years ago |
|
z9hang
|
9e4dbcc08e
|
加回学校主页学校的超链接
|
11 years ago |
|
z9hang
|
3e37a54a0f
|
修复竞赛处不能留言问题
|
11 years ago |
|
z9hang
|
f2cb1390da
|
修复带pre标签缺陷留言的显示问题
|
11 years ago |
|
sw
|
d38e009469
|
取消学号显示，增加参与人员在作业列表的显示
|
11 years ago |
|
sw
|
71bb76ff91
|
作业显示界面页面改造，实现新的页面显示效果
|
11 years ago |
|
nwb
|
8a5e1f5d9f
|
界面修改
|
11 years ago |
|
z9hang
|
9061a77221
|
修改user.user_score为空问题的解决方式
|
11 years ago |
|
nwb
|
f5c9123647
|
管理员创建课程逻辑修改，管理员创建课程后成为该课程成员
|
11 years ago |
|
z9hang
|
3c89de4c81
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
c0d97870d5
|
项目=》文档 文档提交者添加超链接
|
11 years ago |
|
sw
|
2f66296b62
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
f0b016bcbe
|
讨论区留言编辑修改
|
11 years ago |
|
nwb
|
e17090d506
|
修改课程通知show方法，并添加独立视图
|
11 years ago |
|
nwb
|
462e5ab589
|
修改课程资源文件类型编辑BUG
|
11 years ago |
|
nwb
|
80145c5c3b
|
修改课程列表动态数显示不正确的BUG
|
11 years ago |
|
z9hang
|
d2db58050d
|
修复部分未填工作单位报错问题
|
11 years ago |
|
z9hang
|
08ba10c32d
|
添加超链接
已添加的超链接：
学校主页，课程信息中的学校名称
竞赛中项目列表： 参赛人
竞赛中参入竞赛tab页：参赛代表
修改作业界面教师单位不显示问题，并添加超链接
作业界面作业名称添加超链接
软件众包页面：软件众包名称
软件众包页面：关注栏下头像添加链接，参与项目栏：图片添加链接
贴吧帖子：修复 发帖回帖下方 “由xxx在XXX之前添加”中名子未链接问题
|
11 years ago |
|
nwb
|
0480405afb
|
1.修改原课程各数据迁移文件BUG
2.迁移课程学生数据
|
11 years ago |
|
sw
|
efb6c1fd19
|
1.修改、新增作业增加提交项目选项(可以为空)
2.homework_attach与project增加关联关系
|
11 years ago |
|
sw
|
872357cdf4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
97a4aaf8ab
|
homework_attach增加列project_id及相关数据迁移
编辑作业页面增加选择关联项目，以及数据更新项目的实现
|
11 years ago |
 yanxd
|
8840a11a99
|
attachments error
|
11 years ago |
|
yanxd
|
9b707f2b5a
|
a
|
11 years ago |
|
nwb
|
3afb70bf84
|
主讲教师修改为不允许退出课程
|
11 years ago |
|
z9hang
|
1cb1eeeb1d
|
个人主页：姓名、工作单位
课程主页：课程名称、教师单位
项目主页：项目名称
竞赛主页：竞赛名称
主页：课程列=>单位名称
修复部分个人主页报错问题
|
11 years ago |
|
z9hang
|
ab486aa811
|
补充user_score_details Model及数据迁移文件
|
11 years ago |
|
z9hang
|
da3aa7b291
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
50dbe3d04a
|
添加记录得分变化功能
|
11 years ago |
|
nwb
|
726697a69b
|
BUG修改
|
11 years ago |
|
nwb
|
0de6cc8a31
|
修改作业基础视图
|
11 years ago |
|
nwb
|
ec72bb2904
|
编辑作业逻辑修改
|
11 years ago |
|
yanxd
|
b76f1c2b12
|
管理员用户粉丝列表出错。
|
11 years ago |
|
nwb
|
936c40b490
|
提交作业逻辑和视图修改
|
11 years ago |
|
yanxd
|
2000f1ddf6
|
人物注册地址信息会保存两次的问题。
|
11 years ago |
|
yanxd
|
2f724aa23e
|
xss 过滤memo content中的标签
|
11 years ago |
|
nwb
|
78612488e5
|
1.修改新建作业及视图
2.修改编辑作业及视图
|
11 years ago |
|
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
11 years ago |
|
nwb
|
cdaa27b52b
|
文件上传去掉tag显示
|
11 years ago |
|
z9hang
|
f9a17241da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9e53ad67d0
|
去除个人分数显示的链接
|
11 years ago |
