 cxt
|
f74e5eb6ae
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-12 17:49:13 +08:00 |
|
cxt
|
0f61994252
|
点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品
|
2016-05-12 17:49:07 +08:00 |
 Tim
|
2ac201ffdd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-12 17:41:42 +08:00 |
|
Tim
|
565d5e3bcc
|
作业测验列表html代码重构，添加序号列
|
2016-05-12 17:41:27 +08:00 |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
|
cxt
|
fdefbf3795
|
作品打分连续点击不会多次提交
|
2016-05-11 15:31:33 +08:00 |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
2016-05-11 09:18:55 +08:00 |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
2016-05-10 15:26:08 +08:00 |
|
cxt
|
ba07e564db
|
老师评分的弹框
|
2016-05-10 11:51:41 +08:00 |
|
cxt
|
11017d72c5
|
老师对作品的评分可为空
|
2016-05-10 11:28:24 +08:00 |
 huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-06 22:02:22 +08:00 |
|
cxt
|
262fd8bb65
|
学生提交禁用匿评的作业时会弹出匿评关闭的提示
|
2016-05-06 18:54:51 +08:00 |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
|
cxt
|
71dcedc443
|
取消作品评分的缺省评分
|
2016-05-04 16:24:42 +08:00 |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
2016-04-29 17:57:32 +08:00 |
|
cxt
|
c2d60b8958
|
教师优先的迟交扣分和缺评扣分
|
2016-04-29 16:38:26 +08:00 |
|
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
|
2016-04-27 16:27:55 +08:00 |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
2016-04-27 16:21:35 +08:00 |
|
cxt
|
379859db67
|
评分设置
|
2016-04-22 17:33:49 +08:00 |
|
cxt
|
1d1a44f85f
|
Merge branch 'cxt_course' into develop
|
2016-04-22 16:33:57 +08:00 |
|
cxt
|
8f6b116c51
|
作品详情打不开
|
2016-04-22 14:46:58 +08:00 |
|
cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
2016-04-22 12:40:20 +08:00 |
|
cxt
|
7673fc41fb
|
作品列表页面增加提交作品的入口
|
2016-04-22 12:37:13 +08:00 |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
2016-04-22 11:27:30 +08:00 |
|
cxt
|
16348654a5
|
启用匿评和禁用匿评时修改评分设置
|
2016-04-21 17:00:30 +08:00 |
 yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-20 09:55:29 +08:00 |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
2016-04-20 09:51:51 +08:00 |
|
cxt
|
1ded6ddf04
|
学生无法编辑已提交的编程作品
|
2016-04-19 13:03:12 +08:00 |
|
yuanke
|
87c33725e4
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/student_work/work_canrepeat.js.erb
|
2016-04-15 19:01:11 +08:00 |
|
yuanke
|
c1c20fda3b
|
修改学生也能看到代码查重的BUG
|
2016-04-15 18:59:47 +08:00 |
|
yuanke
|
3136191de8
|
查重修改
|
2016-04-15 18:51:31 +08:00 |
|
yuanke
|
5aba3fb11b
|
修改查重有时候失败的问题
|
2016-04-15 18:48:39 +08:00 |
|
cxt
|
51478bd232
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 17:21:07 +08:00 |
|
cxt
|
b07c3947d6
|
Merge branch 'cxt_course' into develop
|
2016-04-15 17:20:55 +08:00 |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
2016-04-15 17:07:38 +08:00 |
|
cxt
|
eeecc5ad08
|
禁用匿评的作业点击评分设置时不应出现缺评扣分的选项
|
2016-04-15 17:06:45 +08:00 |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
|
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
2016-04-15 11:29:40 +08:00 |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
2016-04-15 11:28:20 +08:00 |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-14 11:32:35 +08:00 |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 11:29:26 +08:00 |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-13 16:52:52 +08:00 |
|
cxt
|
2889353844
|
作品列表中的“未参与”增加tip：“该作品未被匿评”
|
2016-04-13 16:27:20 +08:00 |
|
cxt
|
7fcd229f85
|
分组作业--作品列表中：点击关联的项目跳转至该项目主页
|
2016-04-13 10:09:54 +08:00 |
|
huang
|
9f44babff5
|
去掉作业提交附件中用户名
|
2016-04-08 18:20:06 +08:00 |
|
cxt
|
c3ee4dadfb
|
作品提交确认框的高度添加限制
|
2016-04-05 11:24:13 +08:00 |
|
cxt
|
69373468ae
|
作品详情打不开
|
2016-03-29 18:22:41 +08:00 |
|
cxt
|
f46985c8bc
|
作品点赞报500
|
2016-03-28 17:20:46 +08:00 |
|
yuanke
|
ef49715b08
|
编程测试加个results为空判断
|
2016-03-25 21:11:13 +08:00 |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
2016-03-25 15:59:49 +08:00 |
|
cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 15:37:15 +08:00 |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
2016-03-25 14:58:17 +08:00 |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
2016-03-25 14:43:51 +08:00 |
 ouyangxuhua
|
589f939bbd
|
消息类型“学生再次提交作业”中的链接，应该打开学生作品
|
2016-03-24 11:39:38 +08:00 |
|
cxt
|
fe35bb3b44
|
学生打开作品列表报500
|
2016-03-23 14:42:27 +08:00 |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
2016-03-21 14:40:47 +08:00 |
|
cxt
|
b1f3395bd1
|
修改作品描述框和名称框的提示文字
|
2016-03-18 14:45:42 +08:00 |
|
cxt
|
119b12349b
|
作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交
|
2016-03-18 10:56:35 +08:00 |
|
cxt
|
0f80f0e377
|
作品列表：已禁用了匿评的作业就不要显示“匿评截止时间”了
|
2016-03-17 15:54:10 +08:00 |
|
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
|
2016-03-17 15:27:52 +08:00 |
|
cxt
|
a1f393c117
|
批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样
|
2016-03-17 15:21:09 +08:00 |
|
cxt
|
2eefdcd0ee
|
批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样
|
2016-03-17 15:17:00 +08:00 |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
2016-03-17 15:03:34 +08:00 |
|
cxt
|
90d664bbca
|
学生提交作品时描述框可以直接插入图片，作品列表也直接显示图片。
|
2016-03-15 16:36:10 +08:00 |
|
cxt
|
3d1f7cc0a8
|
提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值
|
2016-03-14 15:02:37 +08:00 |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
|
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
2016-03-11 16:17:51 +08:00 |
 luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
2016-03-10 11:40:56 +08:00 |
|
cxt
|
cc441826ee
|
测试代码即提交代码 系统得分为当次的测试得分
|
2016-03-10 11:15:37 +08:00 |
|
cxt
|
a5cb3d5e6a
|
新建作品时的输入框改为“请输入作品名称”、“请输入作品描述”
|
2016-03-04 15:14:38 +08:00 |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
2016-02-25 16:18:24 +08:00 |
|
ouyangxuhua
|
25e32f09e1
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/words/create_reply.js.erb
|
2016-02-01 10:14:04 +08:00 |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
2016-01-29 16:55:07 +08:00 |
|
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
|
2016-01-29 15:44:26 +08:00 |
 guange
|
d2c6d9272c
|
输出结果匹配\r问题
|
2016-01-27 11:35:27 +08:00 |
|
Tim
|
76063b0911
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_project_info.html.erb
|
2016-01-26 15:08:38 +08:00 |
|
Tim
|
821ade7985
|
作业列表优化，课程加入退出
|
2016-01-26 11:00:24 +08:00 |
|
cxt
|
fc0b589760
|
Merge branch 'cxt_course' into szzh
|
2016-01-22 20:54:14 +08:00 |
|
cxt
|
c4a264f8a6
|
提交作品时的附件显示
|
2016-01-22 18:48:50 +08:00 |
|
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-22 17:29:33 +08:00 |
|
huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
2016-01-22 17:27:21 +08:00 |
|
cxt
|
e09f795171
|
附件的显示
|
2016-01-22 17:05:58 +08:00 |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
2016-01-20 16:03:28 +08:00 |
|
cxt
|
6e582fa631
|
老师评阅作品时可以不写评语，只有学生匿评的时候才强制写评语
|
2016-01-19 09:55:28 +08:00 |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
2016-01-18 10:13:31 +08:00 |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-08 18:09:21 +08:00 |
|
cxt
|
5b234580a8
|
学生作品列表打开报500
|
2016-01-07 15:59:51 +08:00 |
|
cxt
|
9ccca401f6
|
匿评时也显示系统测试情况
|
2016-01-05 16:47:55 +08:00 |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
2016-01-05 16:46:06 +08:00 |
|
cxt
|
1448c4f90e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 17:28:34 +08:00 |
|
Tim
|
077368f597
|
匿评增加系统评分显示，对应样式调整
|
2015-12-30 16:02:31 +08:00 |
|
cxt
|
9348cc9c24
|
编程作业匿评添加系统评分
|
2015-12-30 15:22:26 +08:00 |
|
guange
|
aa951cd7b9
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 13:18:40 +08:00 |
|
guange
|
941d6d09d5
|
查看代码在firefox中显示不了的问题
|
2015-12-30 13:18:30 +08:00 |
|
cxt
|
179058f1aa
|
学生总成绩不能为负分
|
2015-12-29 14:55:20 +08:00 |
|
cxt
|
e6ebcb7ac6
|
作品列表页面的截止时间改为提交截止时间/匿评截止时间
|
2015-12-29 11:08:38 +08:00 |
|
cxt
|
c821826bd8
|
附件描述-》追加理由
|
2015-12-28 15:17:16 +08:00 |
|
cxt
|
bca503f171
|
追加附件必须填写描述
|
2015-12-25 17:07:27 +08:00 |