Commit Graph

13413 Commits

Author SHA1 Message Date
huang 43f5f821d5 组织未登录用户不显示设置按钮 2016-04-19 11:10:58 +08:00
huang ade19af9f2 未登录附件不能下载问题 2016-04-19 10:55:17 +08:00
huang a907089bd0 附件历史版本可以删除 2016-04-19 10:41:48 +08:00
huang 3b373a78fe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-18 15:38:31 +08:00
huang 7259d607dc Merge branch 'hjq_beidou' into develop 2016-04-18 15:38:11 +08:00
huang 8064fe6c46 讨论区新建帖子代码优化 2016-04-18 15:37:32 +08:00
huang 41aa81f966 rake 任务:同步文件数 2016-04-18 14:44:29 +08:00
txz 73b89cdde5 微信边框,回复点赞样式更改 2016-04-18 11:19:13 +08:00
yuanke 8c5497ac45 Merge branch 'yuanke' into develop 2016-04-15 19:21:11 +08:00
yuanke fcfd17c8c9 修改代码评测的一个BUG 2016-04-15 19:20:24 +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
yuanke 5efd55de2d Merge branch 'yuanke' into develop 2016-04-15 17:37:17 +08:00
yuanke 19a95dfc9c 作业列表加上代码查重 2016-04-15 17:36:23 +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
cxt 8611fbbdec 新建课程界面中关于学时的输入提示不合理,提示为只能输入数字,但是输入负数或小数时不能执行提交操作,应该修改为只能输入正整数。 2016-04-15 17:10:44 +08:00
yuanke 3dbedcdcbf Merge branch 'yuanke' into develop
Conflicts:
	db/schema.rb
2016-04-15 17:08:51 +08:00
yuanke 764dffd95e 动态里面加上代码查重 2016-04-15 17:07:38 +08:00
cxt eeecc5ad08 禁用匿评的作业点击评分设置时不应出现缺评扣分的选项 2016-04-15 17:06:45 +08:00
huang 16bba76f61 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 16:52:15 +08:00
huang 6027b6d0f5 Merge branch 'hjq_beidou' into develop
Conflicts:
	db/schema.rb
2016-04-15 16:51:37 +08:00
huang 5e5f677bab 动态中显示默认分支的统计 2016-04-15 16:50:39 +08:00
huang a18daeecd1 版本库统计与动态统一 2016-04-15 16:01:25 +08:00
cxt 4c4afb7a94 在新窗口中打开作业批次列表中的作业 2016-04-15 15:57:49 +08:00
huang a21200ab14 动态中添加分支 2016-04-15 15:53:29 +08:00
cxt 9fdd229b2c Merge branch 'cxt_course' into develop 2016-04-15 15:45:54 +08:00
huang 4a8d572cb1 项目动态中版本库统计样式 2016-04-15 15:38:08 +08:00
cxt 7f3fcb7d01 精品课程列表中的全部课程可点击动态数排序 2016-04-15 14:54:17 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke
Conflicts:
	db/schema.rb
2016-04-15 14:13:44 +08:00
yuanke 8eebfd7480 Merge branch 'yuanke' into develop 2016-04-15 12:40:06 +08:00
yuanke 365540cf1f 管理员界面显示代码测试列表的修改 2016-04-15 12:39:22 +08:00
huang 40b45ce1b4 版本库动态中统计改成从数据库获取 2016-04-15 12:24:54 +08:00
cxt 36e8b05f9c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 11:32:38 +08:00
cxt bca0a4bf39 Merge branch 'cxt_course' into develop 2016-04-15 11:32:24 +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
cxt 143f3f8f9a 管理员界面增加精品课程的设置 2016-04-15 11:26:56 +08:00
cxt 3b4f6f4846 添加分班和修改分班名称时刷新学生列表 2016-04-14 17:24:56 +08:00
cxt 829399b8af 个人主页的课程列表和项目列表排序 2016-04-14 16:59:25 +08:00
cxt 96accf1e7a 未发布的作业不应进行作业的积分统计 2016-04-14 15:35:27 +08:00
cxt 2d4f724e33 导出的学生列表作品排序按作业发布时间升序排列 2016-04-14 15:01:18 +08:00
Tim 5ba2149f43 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-04-14 14:50:31 +08:00
cxt 4e4eb7b759 学生作业积分默认显示两位小数 2016-04-14 14:50:33 +08:00
Tim 37bd547d87 作业下拉框效果 2016-04-14 14:50:16 +08:00
cxt d91d2bfa17 作业下拉列表显示全部作业 2016-04-14 14:45:42 +08:00
Tim f479277a96 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-04-14 14:38:34 +08:00
yuanke 36f3d61915 Merge branch 'yuanke' into develop 2016-04-14 14:36:30 +08:00