jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,167 Commits 98 Branches 0 Tags 0 B
Commit Graph

381 Commits

Author SHA1 Message Date
huang 27d029271b Merge branch 'cxt_course' into develop 2016-05-20 22:08:45 +08:00
Tim 51cd9c6dd1 学号溢出bug 2016-05-20 21:47:31 +08:00
huang cdde844e44 Merge branch 'cxt_course' into develop 2016-05-20 21:01:30 +08:00
Tim dd4786d639 作品列表查看详情定位 2016-05-20 20:44:13 +08:00
Tim 5f4a9304fe 提交成绩后，列表成绩没刷新修改；分组作业列表宽度调整 2016-05-20 20:05:39 +08:00
Tim 1c7efa247e 老师提交分数后格式混乱修改 2016-05-20 19:13:55 +08:00
cxt 56a151a7b4 学生打开的作品列表中不应通过下拉列表访问到挂起的作业 2016-05-20 19:11:09 +08:00
cxt 8f9ead0a12 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-20 15:39:37 +08:00
cxt da375dcb4e 挂起作业的作品列表中下拉列表的内容为空，截止时间和发布时间不应显示 2016-05-20 15:39:07 +08:00
Tim 13f83719c1 作品列表改为table布局 2016-05-20 15:15:42 +08:00
huang 561f1b0572 Merge branch 'cxt_course' into develop 2016-05-13 18:25:15 +08:00
cxt 821cd8ad99 作品列表样式调整 2016-05-13 17:26:17 +08:00
cxt 01287ff93c 学生打开新建的作业列表报500 2016-05-13 14:40:28 +08:00
cxt 345e1c0a48 评分的回复连续点击多次防止提交多次表单 2016-05-13 10:57:45 +08:00
cxt cc92105da9 作品列表添加序号及样式调整 2016-05-13 09:58:24 +08:00
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