Commit Graph

15588 Commits

Author SHA1 Message Date
cxt 80b8fc4444 “我的作业”中有挂起的作业时会报500 2016-08-11 14:44:43 +08:00
cxt bae0562b97 适用专业和先修课程的换行显示 2016-08-11 10:32:57 +08:00
cxt 9b8470b813 编辑分组作业后点确定,原来设置的基于项目实施会被取消 2016-08-11 10:23:44 +08:00
cxt d99348c245 测验描述超出边框 2016-08-11 09:46:41 +08:00
cxt 7edb30754b student_works添加字段commit_time,记录学生作品实际的提交时间 2016-08-10 16:50:27 +08:00
cxt 71326c901d 学生在启动匿评后再提交作品,此时该学生及该学生的作品是不被匿评的,应该是“查看作品” 2016-08-10 16:09:13 +08:00
cxt a50ac2d79d 禁用匿评的作业提交时不要显示“提示:作品名称和描述中不要出现真实的姓名信息”的提示 2016-08-10 14:22:05 +08:00
cxt 0cc9fafddb “关注、粉丝”页面中分页显示要紧跟上面的内容 2016-08-09 17:21:11 +08:00
cxt a3011c319b 我的题库显示我的所有作业 2016-08-09 16:40:56 +08:00
cxt fc3df1c26f 题库预览弹框的样式调整 2016-08-09 16:38:17 +08:00
cxt c891a41ef1 打印log 2016-08-09 15:23:21 +08:00
cxt d3db6719eb “我的作业”中编辑作业不跳转到“题库”,而是返回到“我的作业” 2016-08-05 18:41:32 +08:00
cxt 55637808ff 班级作品:两种角色的成员,先学生身份提交作品,再教辅身份评阅自己的作品,评阅结果不能自动刷新 2016-08-05 18:07:54 +08:00
cxt f5a2d6acdb 班级作品:学生提交作品弹出作品校验框,点击重试后,作品列表中默认生成的作品记录就没有了 2016-08-05 17:33:31 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
cxt f9bfe278c0 多重身份的学生匿评变为了教辅评分 2016-08-05 10:03:47 +08:00
cxt b7c05fed4a 首页样式和js调整 2016-08-04 16:33:51 +08:00
cxt 6c7b53f7d4 首页左侧栏 2016-08-04 11:05:34 +08:00
cxt f262447ff1 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/users/user_homeworks.html.erb
2016-08-03 15:01:43 +08:00
cxt cecf917764 从题库选用作业时增加提示:“您选中的题是“我收到的作业”,不能选用” 2016-08-03 15:00:16 +08:00
Tim a5fe620452 题库翻页居中对齐 2016-08-03 14:57:02 +08:00
cxt bae775ec34 题库的搜索调整 2016-08-03 14:06:47 +08:00
cxt acc3ba121f 测试集的显示、新版分页 2016-08-03 13:46:59 +08:00
cxt 718b13e6c1 新版题库 2016-08-03 11:12:55 +08:00
cxt 5b66489b61 Merge branch 'develop' into cxt_course 2016-08-01 14:06:16 +08:00
cxt 18539b45de Merge branch 'dev_shcool' into develop 2016-08-01 14:03:58 +08:00
cxt 6d17329a6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-01 13:58:02 +08:00
cxt 3bc696a597 申请学校的更改 2016-08-01 13:57:55 +08:00
daiao 5272f20de8 单位审核bug的修复 2016-08-01 13:56:37 +08:00
huang 8a8860bd6c gemfile注释后恢复 2016-08-01 09:51:13 +08:00
huang 3feb0680cc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-01 09:50:31 +08:00
huang f7e8c5232c 个人主页加入项目,如果已经申请了则提示已申请 2016-08-01 09:50:05 +08:00
daiao 4004e30216 Merge branch 'develop' into dev_shcool 2016-08-01 08:43:50 +08:00
cxt 87e3707b52 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:54:17 +08:00
cxt 0ac906a5cf 消息列表报500 2016-07-29 23:54:10 +08:00
daiao 8e805d382a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:50:39 +08:00
daiao 6ea829131b 单位列表发送消息样式调整 2016-07-29 23:48:12 +08:00
huang 30ce469483 申请加入项目删除邮件 2016-07-29 23:37:31 +08:00
daiao 15227907ea Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:23:11 +08:00
huang 07ff420a6a 退出项目的时候清楚申请信息 2016-07-29 23:23:04 +08:00
daiao db690bedab 单位名称列表缺陷修复 2016-07-29 23:22:32 +08:00
huang 21eed9ebb3 去掉同意拒绝“:” 2016-07-29 23:03:18 +08:00
huang 08b1f0c266 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 22:58:43 +08:00
huang b1fd7048fe 报告人员问题 2016-07-29 22:58:24 +08:00
huang 97288d4eb4 按钮样式 2016-07-29 22:51:13 +08:00
cxt bf529f07a5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 22:49:46 +08:00
cxt 23bb010315 课程列表的资源数显示不对 2016-07-29 22:49:39 +08:00
daiao 20195d2496 Merge branch 'dev_shcool' into develop 2016-07-29 22:11:55 +08:00
yuanke 7d0d208676 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 2016-07-29 22:10:06 +08:00
yuanke dce84484ff 修改单位的省市个人资料省市也得修改 2016-07-29 22:09:03 +08:00