 huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
9 years ago |
 cxt
|
695e870a26
|
作品的统计不见了
|
9 years ago |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
9 years ago |
 yuanke
|
6237bcb6cd
|
加个gem 'certified'
|
9 years ago |
|
yuanke
|
a39702f962
|
图片自动上传，代码测试编译错误过长。
|
9 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
9 years ago |
|
cxt
|
f4b8f2c794
|
学生追加附件发送消息
|
9 years ago |
|
cxt
|
d4a35b94f6
|
导出的作品成绩保存为数字格式
|
9 years ago |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
9 years ago |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
9 years ago |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
b0f407aae5
|
去掉导出的作业成绩中的作品描述的html代码
|
9 years ago |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
06586f9e4b
|
导出作业成绩中添加作品描述的导出
|
9 years ago |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
9 years ago |
|
cxt
|
c49627913b
|
更改评分设置中的教师优先，评分未更新
|
9 years ago |
|
yuanke
|
d5805e8103
|
课程、项目列表不显示已删除的
|
9 years ago |
|
yuanke
|
b3fdc45a04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
config/locales/zh.yml
db/schema.rb
|
10 years ago |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
10 years ago |
|
cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
10 years ago |
|
cxt
|
7a90c0ea10
|
评分设置修改多项时不应发多条模板消息
|
10 years ago |
|
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
10 years ago |
|
yuanke
|
8c5497ac45
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
fcfd17c8c9
|
修改代码评测的一个BUG
|
10 years ago |
|
cxt
|
51478bd232
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
b07c3947d6
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
yuanke
|
3dbedcdcbf
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
10 years ago |
|
cxt
|
eeecc5ad08
|
禁用匿评的作业点击评分设置时不应出现缺评扣分的选项
|
10 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
10 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
10 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
10 years ago |
|
huang
|
cd9ad535f5
|
1、修改默认图片
2、作品弹框问题
|
10 years ago |
|
yuanke
|
be1351a4d8
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
ef5d8abf38
|
修改编程作业提示服务器出错的BUG
|
10 years ago |
|
cxt
|
1daf620ed1
|
新建作品点取消时跳到我的作业页面
|
10 years ago |
|
yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
10 years ago |
|
yuanke
|
f217c9097a
|
全部正确需要提示是否提交
|
10 years ago |
|
yuanke
|
88ba2bf556
|
编译错误处理
|
10 years ago |
|
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
10 years ago |
|
yuanke
|
e62ee2eade
|
修改评测问题
|
10 years ago |
|
yuanke
|
4c47dae88b
|
Merge branch 'develop' into yuanke
|
10 years ago |
 alan
|
46951f7af9
|
Merge branch 'develop' into alan_develop
Conflicts:
app/views/student_work/_student_work_list.html.erb
app/views/users/_user_activities.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
10 years ago |
