Commit Graph

118 Commits

Author SHA1 Message Date
cxt c8467a50a0 自己可以给自己点赞 2016-05-25 16:19:41 +08:00
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数 2016-05-20 15:30:25 +08:00
huang faf5e89cc2 Merge branch 'weixin_guange' into develop
Conflicts:
	1234567
	app/views/blogs/_article.html.erb
	db/schema.rb
2016-05-19 16:04:27 +08:00
Tim 0b2fe1d88a 分组作业样式 2016-05-17 11:24:29 +08:00
cxt 0f61994252 点击作业动态优秀排行中学生链接,在打开的作品列表中自动定位到该学生作品并默认打开该作品 2016-05-12 17:49:07 +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 9bc8ccbb9e 教辅可只评语不评分 2016-05-11 09:18:55 +08:00
txz 9b55d8b527 微信版标题显示不完整 2016-05-10 14:06:34 +08:00
cxt 1eb41478b2 课程动态和首页动态中的作业动态实现二级回复 2016-05-09 17:06:10 +08:00
cxt e03bc42c53 Merge branch 'cxt_course' into develop
Conflicts:
	app/controllers/words_controller.rb
2016-05-06 22:53:16 +08:00
cxt 90809ea350 首页报500 2016-05-06 22:18:31 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-05-06 22:02:22 +08:00
huang d212d4f4c5 Merge branch 'cxt_course' into develop 2016-05-03 18:17:54 +08:00
cxt 407af62654 作业动态的分数显示 2016-05-03 18:06:53 +08:00
huang a602a6aa63 Merge branch 'cxt_course' into develop
Conflicts:
	app/views/users/_course_message.html.erb
2016-05-03 17:12:38 +08:00
cxt ada4407e63 局部刷新后 名片不显示 2016-05-03 17:11:30 +08:00
cxt 55297a9daf 统一作业动态中项目的更新时间与tip中的更新时间 2016-05-03 15:19:22 +08:00
yuanke 51245d44fa 编程作业未发布是 由于代码查重按钮的原因导致布局问题。 2016-04-27 10:02:43 +08:00
cxt da73d2b004 Merge branch 'cxt_course' into develop 2016-04-22 12:40:20 +08:00
cxt 9b4c275869 作品动态添加追加附件功能 2016-04-22 11:27:30 +08:00
yuanke 764dffd95e 动态里面加上代码查重 2016-04-15 17:07:38 +08:00
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke
Conflicts:
	db/schema.rb
2016-04-15 14:13:44 +08:00
huang cca570e75c 课程相关优化 2016-03-25 16:30:00 +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 94c1e38066 分组作业动态中的“创建项目”更换颜色 2016-03-11 11:23:16 +08:00
yuanke 7f7979e955 修改回复时可多次点击发送按钮的问题。 2016-03-10 15:12:16 +08:00
cxt ca094a13b5 优秀作品排行中,不允许访问的,就取消链接。老师设置了完全公开的作品,就有链接 2016-03-08 10:16:55 +08:00
cxt e30c26aa09 课程报500 2016-03-07 13:56:28 +08:00
cxt fd8b40a36e 对于编程作业,系统评分的前几名能否也显示出来 2016-03-04 16:53:36 +08:00
cxt 947e6ea469 作业--“禁用匿评”处增加提示语:匿评是同学之间的双盲互评过程:每个同学将评阅系统分配给他/她的若干个作品。 2016-03-04 16:00:20 +08:00
cxt 8e5abe997a 已禁用匿评的作业还显示匿评截止时间不合适 2016-03-03 17:39:08 +08:00
cxt 0b6521c921 禁用匿评的作业动态仍然显示缺评扣分 2016-02-26 16:37:02 +08:00
cxt c93b4d109a 作业动态添加子菜单:公开作品/取消公开 2016-02-25 16:18:24 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
cxt 435f81a422 关联项目的更新时间 2016-01-22 21:47:59 +08:00
cxt f7be78efc7 关联项目的更新时间包含项目的提交时间 2016-01-22 11:10:35 +08:00
cxt 6789693fc7 已评分作品超过5个时,作业优秀作品排行显示“更多” 2016-01-22 10:17:00 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
cxt b64fc1771d Merge branch 'develop' into cxt_course
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
2016-01-20 09:27:29 +08:00
cxt 6e56a0706a 动态描述中的单词折行 2016-01-19 16:53:34 +08:00
cxt 8e9c4bab6b 赞增加tip 2016-01-19 10:08:28 +08:00
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改 2016-01-18 10:13:31 +08:00
huang eecdc26b2f Merge branch 'cxt_course' into develop
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
2016-01-15 15:42:36 +08:00
cxt c49a290d56 Merge branch 'develop' into cxt_course
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
2016-01-15 10:24:37 +08:00
cxt 58c96a0df0 作业动态的点赞 2016-01-14 16:15:40 +08:00
cxt 26631e2199 关联项目的提交次数 2016-01-14 15:39:40 +08:00
cxt 53a45908e9 关联项目的提交次数 2016-01-13 16:54:41 +08:00
cxt e04926f2e7 关联项目的提交次数 2016-01-13 10:04:42 +08:00
cxt 9368e3875c 去掉关联项目的提交次数 2016-01-08 20:35:05 +08:00