 yanxd
|
271af6ead5
|
Merge branch 'szzh' into develop
|
11 years ago |
|
yanxd
|
0e2b7ba362
|
tag search fix
|
11 years ago |
 sw
|
fe4e1cc175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 nwb
|
a03cdf272e
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
9f7951a22c
|
修改BUG
|
11 years ago |
|
nwb
|
41ff47b839
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
52ddee2b2f
|
界面优化
|
11 years ago |
|
nwb
|
bc50390a2e
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
5c0b1f3a47
|
修改界面
|
11 years ago |
|
nwb
|
8564f7a904
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
8d22ccd23a
|
修改BUG
|
11 years ago |
|
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
39b4bd37d4
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
b928eb6ed8
|
修改课程首页“更多”链接错误
|
11 years ago |
|
nwb
|
ae8093c400
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
11 years ago |
|
sw
|
3c7e680b1b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
41999e64b7
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
11 years ago |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
10a844c67f
|
合并导致的，任务列表分页错误
|
11 years ago |
|
yanxd
|
f664ec10b4
|
Merge branch 'szzh' into develop
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
11 years ago |
|
yanxd
|
663634b9da
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
nwb
|
898ecb443a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
11 years ago |
 z9hang
|
fe3861c1d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
54a2fb8a9c
|
主页项目得分与项目页面的项目得分保持一致
|
11 years ago |
|
nwb
|
fb0597ab4a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
11 years ago |
xianbo
|
830e2d4fb4
|
隐藏 站长统计
|
11 years ago |
|
sw
|
063460f119
|
tt
|
11 years ago |
|
z9hang
|
cc2862ae0f
|
修正缺陷不能踩自己提示错误
|
11 years ago |
|
nwb
|
e94ed86ead
|
部分BUG修正
|
11 years ago |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
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
|
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
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
11 years ago |
|
sw
|
08bfb8e80a
|
修复教师评分后星星显示不正常的BUG
|
11 years ago |
|
sw
|
12b16f0bb6
|
1.修复作业界面点击所属任务链接出错的BUG
2.点击所属任务返回作业列表界面
|
11 years ago |
|
sw
|
392dc0c365
|
增加访问作业显示列表的权限
|
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
|
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
|
02e221eedb
|
修改：网站中的旧分数显示为新分数
|
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 |
|
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 |
|
z9hang
|
773b728828
|
修改：自己不能踩或顶自己
|
11 years ago |
|
z9hang
|
9d9bc76af4
|
定时刷新分数
|
11 years ago |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
11 years ago |
|
sw
|
339b5b0296
|
缺陷编辑页面直接显示，不需要点击留言按钮才显示缺陷编辑页面
|
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 |
|
sw
|
600ec536b3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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
|
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 |
|
sw
|
d38e009469
|
取消学号显示，增加参与人员在作业列表的显示
|
11 years ago |
|
sw
|
71bb76ff91
|
作业显示界面页面改造，实现新的页面显示效果
|
11 years ago |
|
nwb
|
8a5e1f5d9f
|
界面修改
|
11 years ago |
|
z9hang
|
9061a77221
|
修改user.user_score为空问题的解决方式
|
11 years ago |
|
z9hang
|
3c89de4c81
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
