Commit Graph

386 Commits

Author SHA1 Message Date
sw b5af66ffc2 取消匿评时间的js判断 2015-09-23 09:58:31 +08:00
sw f2325dee88 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-22 16:21:54 +08:00
sw 9d2b58738e 分班过滤功能 2015-09-22 16:16:55 +08:00
sw 90536efa1e 课程内姓名学号邮箱过滤,各种排序 改为js刷新页面 2015-09-22 15:52:08 +08:00
sw 7a62b7f13d 增加匿评开启时间和匿评关闭时间,并对其业务逻辑进行js的控制。以及这两个值得修改 2015-09-21 17:11:45 +08:00
cxt 9be7e633ae 动态回复框的样式调整 2015-09-21 16:20:29 +08:00
guange 8ab08ea30f Merge remote-tracking branch 'origin/szzh' into guange_homework 2015-09-19 18:18:02 +08:00
guange b6240127a9 对编程框进行代码着色 2015-09-19 18:17:12 +08:00
sw 2a8cf2885a 布置作业时选择语言显示不正确 2015-09-19 16:23:47 +08:00
sw ccd19021ae 课程动态回复之后,编辑器变宽 2015-09-19 13:45:32 +08:00
sw a54a51c984 Merge branch 'guange_homework' into szzh
Conflicts:
	app/models/homework_detail_programing.rb
	db/schema.rb
2015-09-19 11:21:45 +08:00
cxt b9bac42c1a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-19 11:18:55 +08:00
cxt 098be99b84 动态回复框的样式调整 2015-09-19 11:18:41 +08:00
guange bebc602efc merge 2015-09-18 17:51:51 +08:00
huang 850a7c937f Merge branch 'szzh' into dev_hjq 2015-09-18 17:39:37 +08:00
cxt cacb3e043a 动态回复框的焦点前焦点后样式调整 2015-09-18 16:34:37 +08:00
huang f041c80d0a Merge branch 'szzh' into dev_hjq
Conflicts:
	app/views/users/user_messages.html.erb
	db/schema.rb
	public/stylesheets/new_user.css

解决冲突
2015-09-18 13:08:12 +08:00
sw f04e0c5f84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2015-09-18 11:34:29 +08:00
cxt ad610cb0b2 测试集输入输出框的自适应高度 2015-09-18 11:29:38 +08:00
sw 859fe01c52 1、编程作业无法导出缺评、匿评列表
2、编程作业评分设置初始值
2015-09-18 11:14:59 +08:00
sw 7cc5ce92c6 完成评分比例设置功能 2015-09-17 20:20:20 +08:00
sw cc7a752623 到处附件、缺评、匿评、成绩列表 2015-09-17 17:20:29 +08:00
sw 47cdf1231d 匿评评分,成绩提示框的显示 2015-09-17 14:26:41 +08:00
Tim 3d5f93b938 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_course_news.html.erb
	app/views/users/_project_issue.html.erb
	app/views/users/_project_message.html.erb
	app/views/users/_user_activities.html.erb
	public/stylesheets/new_user.css
2015-09-16 16:13:40 +08:00
sw 5f08ecc7e3 1、作业的开启匿评、关闭匿评功能
2、提交作品时,迟交扣分、缺评扣分的计算--->改为只计算数量
3、
2015-09-16 10:26:13 +08:00
Tim 77a8c18a77 1.关于我们样式修改;
2.登录界面格式调整;
3.个人动态回复样式调整;
2015-09-16 10:16:25 +08:00
sw 4a959523c1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-16 09:51:59 +08:00
huang b0ccf9037a 邮件邀请:
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
2015-09-15 17:39:57 +08:00
sw cd96fd99a8 快速创建项目 2015-09-15 16:11:55 +08:00
cxt 069c1ddf3c 课程通知页面的评论提示 2015-09-15 15:45:16 +08:00
sw f79b2cda94 提交作品关联项目功能 2015-09-15 15:18:33 +08:00
sw 8f3889e2c5 编程作品提交框自动增高 2015-09-11 18:03:37 +08:00
sw b6452bb652 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:58:05 +08:00
sw ecf2ac5e19 课程内发布作业增加提示 2015-09-11 16:57:49 +08:00
lizanle c701eefb42 暂时不添加 我要回复 2015-09-11 16:45:57 +08:00
lizanle b99663a773 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-11 16:44:28 +08:00
lizanle 9f871ababb 添加 我要回复 2015-09-11 16:44:19 +08:00
sw 37f235c2ab 导入编程作业 2015-09-11 16:22:35 +08:00
sw 96405d7c0c 取消之后编程按钮无效 2015-09-11 15:38:58 +08:00
guange ca8f943a97 js函数重构 2015-09-11 15:03:20 +08:00
guange e9f9dd44b9 编程作业的修改功能搞定 2015-09-11 14:59:30 +08:00
sw f4c19c0fb0 1、homework.js on改为live
2、导入作业之后,编程功能按钮消失
2015-09-11 10:50:16 +08:00
sw a94521f2e1 编辑普通作业功能完成 2015-09-11 09:36:44 +08:00
lizanle cc6fe754d4 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-10 15:45:46 +08:00
lizanle 756aae0cf2 发布issue编辑器可以上传代码并高亮显示了 2015-09-10 15:45:08 +08:00
sw e30abd2a81 提交、修改作品界面宽度 2015-09-09 17:50:49 +08:00
sw 519f079bcc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 16:54:21 +08:00
sw 401b0bc7e3 textarea自动拉伸高度优化,编辑普通作业作品功能完成 2015-09-09 16:50:46 +08:00
sw b1463f0864 学生提交匿评作业作品功能实现 2015-09-09 16:10:11 +08:00
lizanle 24dce81b31 高度参数用一个 2015-09-09 14:57:42 +08:00