huang
|
c88d214bb9
|
处理冲突
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_cache
Conflicts:
app/views/courses/_course_activity.html.erb
app/views/courses/_course_heroes.html.erb
app/views/users/_message_contents.html.erb
|
10 years ago |
huang
|
6fccc7b50c
|
Merge branch 'develop' into dev_cache
Conflicts:
.gitignore
app/controllers/blogs_controller.rb
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/models/comment.rb
app/models/journals_for_message.rb
app/models/news.rb
app/views/courses/_course_activity_users.html.erb
app/views/layouts/new_base_user.html.erb
app/views/projects/_act_messages.html.erb
app/views/projects/_project_message_contents.html.erb
app/views/users/_course_homework.html.erb
app/views/users/_course_journalsformessage.html.erb
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_homework_post_reply.html.erb
app/views/users/_message_contents.html.erb
app/views/users/_news_contents.html.erb
app/views/users/_project_message.html.erb
app/views/users/_user_blog.html.erb
app/views/users/_user_journalsformessage.html.erb
|
10 years ago |
黄井泉
|
b8eee2b131
|
Merge branch 'cxt_course' into 'develop'
本周上线任务
See merge request !50
|
10 years ago |
cxt
|
0b217b9998
|
基于项目的分做作业,关联项目列表需要增加“更换项目”的功能
|
10 years ago |
cxt
|
9ca4001c8c
|
追加附件的调整
|
10 years ago |
cxt
|
c24f9b8c3b
|
作业的小齿轮菜单增加“启用匿评”的选项,同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评”
|
10 years ago |
cxt
|
494946c70e
|
匿评结束后提交的作品也应计算缺评扣分
|
10 years ago |
cxt
|
28444e0af7
|
“未评分”改为“无评分”, 评分设置的缺评扣分
|
10 years ago |
cxt
|
56b6d43862
|
匿评时其他人的评分不可见
|
10 years ago |
cxt
|
0afed6624d
|
未参与匿评的缺评扣分
|
10 years ago |
yuanke
|
2d5fbdfaaa
|
Merge branch 'develop' into yuanke_objectcache
Conflicts:
app/views/projects/_project_message_contents.html.erb
|
10 years ago |
cxt
|
9a30369cef
|
班级作业:两种身份(助教和学生)的成员匿评扣分错误
|
10 years ago |
yuanke
|
cec157944b
|
Merge branch 'develop' into yuanke_objectcache
Conflicts:
app/models/homework_common.rb
app/views/courses/_course_activity_users.html.erb
app/views/users/_course_message.html.erb
|
10 years ago |
cxt
|
16c51e1eaa
|
基于项目的分组作业没有显示项目详情
|
10 years ago |
yuanke
|
7debb74164
|
Merge branch 'develop' into yuanke_objectcache
Conflicts:
app/models/news.rb
app/views/users/_message_contents.html.erb
app/views/users/_news_contents.html.erb
|
10 years ago |
cxt
|
f8316ee1ee
|
分组作业的缺评扣分
|
10 years ago |
cxt
|
4377fc1f9e
|
班级作业:评分设置中最终得分“教师优先”、“教辅优先”轮流切换多次后,得分计算错误
|
10 years ago |
cxt
|
d762c68f7b
|
分组作业的页面显示和评分处理调整
|
10 years ago |
cxt
|
6f1c648770
|
班级作业:修改评分后,同一人的之前的评分,就不显示了
|
10 years ago |
cxt
|
20f112d5ad
|
作业评分设置的调整
|
10 years ago |
yuanke
|
3d9ec521d8
|
英雄榜缓存修改
|
10 years ago |
cxt
|
065b3b15f3
|
代码梳理
|
10 years ago |
cxt
|
ec45ee89d9
|
已截止的分组作业:组长可编辑成员
|
10 years ago |
cxt
|
251465ceb5
|
袁可 编程
|
10 years ago |
yuanke
|
89d91f69c2
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
yuanke
|
2ac827c66f
|
修改代码测试出错时的日志打印
|
10 years ago |
cxt
|
d1c284c953
|
作业详情页
|
10 years ago |
cxt
|
ba4a1c64d9
|
作业动态的重构
|
10 years ago |
cxt
|
b468134e3e
|
Merge branch 'cxt_course' into develop
|
10 years ago |
cxt
|
abdc08c7af
|
提交作品时左侧导航栏对应班级的导航栏
|
10 years ago |
cxt
|
1bd93904af
|
Merge branch 'cxt_course' into develop
|
10 years ago |
cxt
|
6f4618fffb
|
分组作业可对组员单独评分
|
10 years ago |
huang
|
9f5e257890
|
作品列表搜索问题
|
10 years ago |
huang
|
390f68aad6
|
作品列表页面性能提升(主要是数据库查询减少,建立相关索引)
|
10 years ago |
cxt
|
7b2943c37a
|
重试
|
10 years ago |
cxt
|
7b2ce93acc
|
分组作业添加成员
|
10 years ago |
cxt
|
e2aef37114
|
分组作品的提交出错
|
10 years ago |
cxt
|
bf4c6d049c
|
新建分组作业时不创建作品列表
|
10 years ago |
cxt
|
1e7f3db946
|
分组作业:组内每个成员都复制一份组长的作业,得分相同
|
10 years ago |
cxt
|
e61cf5dd4f
|
多重身份的成员:教师模拟答题和学生答题作为两条记录
|
10 years ago |
cxt
|
0ce61bfee8
|
学生删除作品时将作品还原为初始状态
|
10 years ago |
cxt
|
461912bec2
|
班级作业,上传附件提交作品,重试后直接提交,提交页面附件不显示但验证弹框中被删除的附件又显示了
|
10 years ago |
cxt
|
06361246c7
|
作品列表中的已提交人数无法自动刷新
|
10 years ago |
cxt
|
7edb30754b
|
student_works添加字段commit_time,记录学生作品实际的提交时间
|
10 years ago |
cxt
|
55637808ff
|
班级作品:两种角色的成员,先学生身份提交作品,再教辅身份评阅自己的作品,评阅结果不能自动刷新
|
10 years ago |
cxt
|
f5a2d6acdb
|
班级作品:学生提交作品弹出作品校验框,点击重试后,作品列表中默认生成的作品记录就没有了
|
10 years ago |
cxt
|
f9bfe278c0
|
多重身份的学生匿评变为了教辅评分
|
10 years ago |
daiao
|
6ab2c15504
|
修复先删除课程下的某班级,再删除该课程报错
|
10 years ago |
daiao
|
67bdea314a
|
作品列表-分班过滤:点击“请选择分班”过滤显示所有学生
|
10 years ago |
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
10 years ago |