 cxt
|
5baf467d13
|
作品评分不覆盖
|
9 years ago |
|
cxt
|
ba07e564db
|
老师评分的弹框
|
9 years ago |
|
cxt
|
11017d72c5
|
老师对作品的评分可为空
|
9 years ago |
 huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
262fd8bb65
|
学生提交禁用匿评的作业时会弹出匿评关闭的提示
|
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
|
71dcedc443
|
取消作品评分的缺省评分
|
9 years ago |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
c2d60b8958
|
教师优先的迟交扣分和缺评扣分
|
9 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
|
9 years ago |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
9 years ago |
|
cxt
|
379859db67
|
评分设置
|
9 years ago |
|
cxt
|
1d1a44f85f
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
8f6b116c51
|
作品详情打不开
|
9 years ago |
|
cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
7673fc41fb
|
作品列表页面增加提交作品的入口
|
9 years ago |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
9 years ago |
|
cxt
|
16348654a5
|
启用匿评和禁用匿评时修改评分设置
|
9 years ago |
 yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
9 years ago |
|
cxt
|
1ded6ddf04
|
学生无法编辑已提交的编程作品
|
10 years ago |
|
yuanke
|
87c33725e4
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/student_work/work_canrepeat.js.erb
|
10 years ago |
|
yuanke
|
c1c20fda3b
|
修改学生也能看到代码查重的BUG
|
10 years ago |
|
yuanke
|
3136191de8
|
查重修改
|
10 years ago |
|
yuanke
|
5aba3fb11b
|
修改查重有时候失败的问题
|
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
|
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 |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
10 years ago |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
cxt
|
2889353844
|
作品列表中的“未参与”增加tip：“该作品未被匿评”
|
10 years ago |
|
cxt
|
7fcd229f85
|
分组作业--作品列表中：点击关联的项目跳转至该项目主页
|
10 years ago |
|
huang
|
9f44babff5
|
去掉作业提交附件中用户名
|
10 years ago |
|
cxt
|
c3ee4dadfb
|
作品提交确认框的高度添加限制
|
10 years ago |
|
cxt
|
69373468ae
|
作品详情打不开
|
10 years ago |
|
cxt
|
f46985c8bc
|
作品点赞报500
|
10 years ago |
|
yuanke
|
ef49715b08
|
编程测试加个results为空判断
|
10 years ago |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
10 years ago |
|
cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
10 years ago |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
10 years ago |
 ouyangxuhua
|
589f939bbd
|
消息类型“学生再次提交作业”中的链接，应该打开学生作品
|
10 years ago |
|
cxt
|
fe35bb3b44
|
学生打开作品列表报500
|
10 years ago |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
b1f3395bd1
|
修改作品描述框和名称框的提示文字
|
10 years ago |
|
cxt
|
119b12349b
|
作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交
|
10 years ago |
|
cxt
|
0f80f0e377
|
作品列表：已禁用了匿评的作业就不要显示“匿评截止时间”了
|
10 years ago |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
10 years ago |
|
cxt
|
a1f393c117
|
批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样
|
10 years ago |
|
cxt
|
2eefdcd0ee
|
批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样
|
10 years ago |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
10 years ago |
|
cxt
|
90d664bbca
|
学生提交作品时描述框可以直接插入图片，作品列表也直接显示图片。
|
10 years ago |
|
cxt
|
3d1f7cc0a8
|
提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值
|
10 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
10 years ago |
 luoquan
|
1900a824e8
|
0
|
10 years ago |
|
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
10 years ago |
|
cxt
|
cc441826ee
|
测试代码即提交代码 系统得分为当次的测试得分
|
10 years ago |
|
cxt
|
a5cb3d5e6a
|
新建作品时的输入框改为“请输入作品名称”、“请输入作品描述”
|
10 years ago |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
10 years ago |
|
ouyangxuhua
|
25e32f09e1
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/words/create_reply.js.erb
|
10 years ago |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
10 years ago |
|
cxt
|
b5cf138f43
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/student_work/_programing_work_show.html.erb
db/schema.rb
|
10 years ago |
guange
|
d2c6d9272c
|
输出结果匹配\r问题
|
10 years ago |
 Tim
|
76063b0911
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_project_info.html.erb
|
10 years ago |
|
Tim
|
821ade7985
|
作业列表优化，课程加入退出
|
10 years ago |
|
cxt
|
fc0b589760
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
cxt
|
c4a264f8a6
|
提交作品时的附件显示
|
10 years ago |
|
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
10 years ago |
|
cxt
|
e09f795171
|
附件的显示
|
10 years ago |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
10 years ago |
|
cxt
|
6e582fa631
|
老师评阅作品时可以不写评语，只有学生匿评的时候才强制写评语
|
10 years ago |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
10 years ago |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
5b234580a8
|
学生作品列表打开报500
|
10 years ago |
|
cxt
|
9ccca401f6
|
匿评时也显示系统测试情况
|
10 years ago |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
10 years ago |
|
cxt
|
1448c4f90e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
Tim
|
077368f597
|
匿评增加系统评分显示，对应样式调整
|
10 years ago |
|
cxt
|
9348cc9c24
|
编程作业匿评添加系统评分
|
10 years ago |
|
guange
|
aa951cd7b9
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
941d6d09d5
|
查看代码在firefox中显示不了的问题
|
10 years ago |
|
cxt
|
179058f1aa
|
学生总成绩不能为负分
|
10 years ago |
|
cxt
|
e6ebcb7ac6
|
作品列表页面的截止时间改为提交截止时间/匿评截止时间
|
10 years ago |
|
cxt
|
c821826bd8
|
附件描述-》追加理由
|
10 years ago |
|
cxt
|
bca503f171
|
追加附件必须填写描述
|
10 years ago |
|
cxt
|
aa653d558f
|
作品确认弹框的按钮样式调整
|
10 years ago |
|
cxt
|
6f12ba883d
|
学生作品列表的tag显示不对
|
10 years ago |
|
cxt
|
a5cc1390f2
|
学生匿评打分时必须填写评语
|
10 years ago |
|
cxt
|
65022f03cb
|
作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新
|
10 years ago |
|
cxt
|
c073e56b79
|
学生匿评必须添加评语
|
10 years ago |
|
cxt
|
459e1f332b
|
编辑分组作品时如果不修改分组成员则不能提交
|
10 years ago |
|
cxt
|
2eaa05306f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/boards/_course_show.html.erb
|
10 years ago |
|
cxt
|
c230ff5bed
|
普通作业提交报500
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
guange
|
b69f5f0da3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
guange
|
c98e9fc639
|
查看作业代码着色
|
10 years ago |
|
cxt
|
3b25616f0c
|
编辑作品时可编辑分组成员
|
10 years ago |
|
cxt
|
a2ebaa0729
|
分组作业提交作品时如果关联了项目则从项目成员中添加分组成员
|
10 years ago |
|
cxt
|
51e082a551
|
编辑和新建作品时的样式和提示信息调整
|
10 years ago |
|
cxt
|
a8c8dc3cc6
|
关联项目的提示信息修改
|
10 years ago |
|
cxt
|
ab96bf8e5e
|
作品列表中未参与匿评的作品显示“未参与”
|
10 years ago |
|
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
guange
|
f61f639af2
|
转换为remote js
|
10 years ago |
|
cxt
|
2b5bf9540d
|
关闭了匿评再补交作品，给学生的提示信息中“当前作业已开启匿评...”改为“当前作业已关闭匿评...”
|
10 years ago |
|
cxt
|
eb8e9f32a3
|
作品列表的私有项目不可点击
|
10 years ago |
|
cxt
|
1674391e4b
|
若删除追加的附件，则“追加附件”字样及“追加时间”也应删除
|
10 years ago |
|
cxt
|
d4bde8e73c
|
调整学生作品列表的样式
|
10 years ago |
|
cxt
|
c6470bc69b
|
提交作品选择分组成员时若某一个学生已加入到其他分组则不可选择
|
10 years ago |
|
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
10 years ago |
|
cxt
|
f880ccd749
|
分组作业
|
10 years ago |
|
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
10 years ago |
|
cxt
|
f2f81d5243
|
作品列表的代码缩进
|
10 years ago |
|
cxt
|
53f9141cf1
|
分组作业动态
|
10 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
|
cxt
|
c26778b41c
|
分组作业关联项目
|
10 years ago |
|
cxt
|
cb7ad682cf
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
cxt
|
a62ecc10ad
|
作业动态设置评分后无法刷新
|
10 years ago |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
cxt
|
19c34de643
|
编辑作品时弹出的作品确认框不提供重试的按钮
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
|
cxt
|
fd51b02e16
|
添加修订附件
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
|
cxt
|
68a29d8131
|
学生提交作品后可点击重试重新上传作品
|
10 years ago |
|
huang
|
41b99af7dd
|
Merge branch 'develop' into sw_new_course
|
10 years ago |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
Tim
|
2d14b66336
|
作品列表样式调整
|
10 years ago |
|
cxt
|
ec00b86c15
|
学生多次新建作品时提醒学生不能重复提交
|
10 years ago |
|
cxt
|
b46561dac1
|
提交作业时若作品名称和作品描述为空，则不弹出作品校验弹框
|
10 years ago |
|
cxt
|
8fa790dd6b
|
作品列表的文字调整
|
10 years ago |
|
cxt
|
41751f08ba
|
学生作品列表右上角的编辑和删除icon增加tip，两个icon的距离增加
|
10 years ago |
|
cxt
|
70ce172b88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 lizanle
|
84348d15ea
|
文件上传的 确定按钮的联动 作业提交回退
|
10 years ago |
|
cxt
|
62cd410e1e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
a01de011ca
|
文件上传的 确定按钮的联动
|
10 years ago |
|
lizanle
|
d13205bd3d
|
文件正在上传提示
|
10 years ago |
|
cxt
|
6dd264990e
|
作品列表的“点击查看详情”
|
10 years ago |
|
cxt
|
4be3b16b60
|
隐藏点击查看详情
|
10 years ago |
|
Tim
|
679ec44f8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/student_work/_evaluation_work.html.erb
|
10 years ago |
|
Tim
|
d9610d2694
|
作品列表提示标签
|
10 years ago |
|
cxt
|
dc7a90cab5
|
助教无法打开学生作品
|
10 years ago |
|
cxt
|
d461e1be0d
|
作品列表的提示信息“您尚未提交作品”
|
10 years ago |
