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 |