Commit Graph

5905 Commits

Author SHA1 Message Date
Tim 9a735c7157 模拟测试提示添加 2015-09-17 11:13:36 +08:00
Tim 5612bb47dd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-17 10:25:46 +08:00
Tim 0930815086 回复头像模糊效果 2015-09-17 10:25:26 +08:00
cxt 036129a622 动态回复后的回复框样式不改变 2015-09-17 10:02:28 +08:00
Tim 5b6ac4564a 回复框头像路径改变 2015-09-17 08:46:43 +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
cxt 3bdab22aca Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-16 15:40:24 +08:00
cxt a184ab4b69 个人动态首页只显示第一个动态的回复框,其它的需点击才显示 2015-09-16 15:40:05 +08:00
sw c21cea85f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-16 14:29:17 +08:00
cxt a714b10860 阻止配置课程、加入课程、新建课程、新建项目版本、新建版本库等页面输入框的自动填充 2015-09-16 12:39:08 +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
cxt fddf466ce1 将发布作业时的引用资源库的“确定”“取消”按钮改成整个按钮可点击 2015-09-16 09:45:27 +08:00
sw 9ee82c57be 去掉课程模块的导航栏 2015-09-15 17:01:39 +08:00
cxt 0a2bfa1bdb 个人主页动态的缺陷回复与缺陷页面的回复内容不一致 2015-09-15 16:27:53 +08:00
sw cd96fd99a8 快速创建项目 2015-09-15 16:11:55 +08:00
cxt 5ccace15da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-15 15:45:29 +08:00
cxt 069c1ddf3c 课程通知页面的评论提示 2015-09-15 15:45:16 +08:00
sw f79b2cda94 提交作品关联项目功能 2015-09-15 15:18:33 +08:00
sw fff9c44271 学生没有课程和项目时,课程和项目导航有2条线 2015-09-15 15:16:49 +08:00
lizanle 1b9bde2284 课程资源的标签库可点击更改 2015-09-15 10:33:05 +08:00
lizanle 71c0bd9b43 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-15 10:32:11 +08:00
lizanle 1ae302621f 课程资源的标签库可点击更改 2015-09-15 10:31:59 +08:00
cxt e10e5e8412 调整课程通知页面的回复头像样式 2015-09-15 09:50:57 +08:00
cxt a999897efa 动态回复头像的调整 2015-09-15 09:22:18 +08:00
cxt d0c19124b7 将课程的“私有”标志改成不可点击 2015-09-14 17:29:00 +08:00
sw 4a9fd15bfd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 18:12:02 +08:00
sw 8f3889e2c5 编程作品提交框自动增高 2015-09-11 18:03:37 +08:00
sw 1673f4f960 1、老师打开编程作品报错
2、隐藏开启匿评按钮
2015-09-11 17:52:37 +08:00
huang 169c7f3a97 修改消息判断作业重复 2015-09-11 17:48:14 +08:00
sw da269ef716 发布作业,请先输入作业标题 2015-09-11 17:27:07 +08:00
huang 0233c9b14b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 17:19:40 +08:00
huang 0d595c5feb 修改系统消息提交按钮 2015-09-11 17:19:12 +08:00
sw 4ee4bb6e9d 编辑作业 2015-09-11 17:07:30 +08:00
sw b31104007a Merge branch 'szzh' into develop 2015-09-11 16:59:10 +08:00
sw ecf2ac5e19 课程内发布作业增加提示 2015-09-11 16:57:49 +08:00
cxt dbdd68f45d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2015-09-11 16:43:59 +08:00
huang 27fde3f642 Merge branch 'szzh' into dev_hjq 2015-09-11 16:37:50 +08:00
huang dc564c37f1 修改系统消息参数
输入内容JS控制
2015-09-11 16:36:10 +08:00
sw a3d628dc17 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:29:55 +08:00
sw 760b70971a 取消导入编程作业时对homework_type的赋值 2015-09-11 16:27:34 +08:00
sw 90a52aa01b 导入编程作业后、测试集数量不显示的问题 2015-09-11 16:26:35 +08:00
sw 37f235c2ab 导入编程作业 2015-09-11 16:22:35 +08:00
ouyangxuhua b053a1e43c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
	app/models/system_message.rb
	app/views/admin/messages.html.erb

处理冲突、发布系统消息JS提醒!
2015-09-11 16:11:34 +08:00
ouyangxuhua 67dcb025aa 系统消息-修改 2015-09-11 16:05:02 +08:00
huang 3da6593720 查看别人的页面时不显示“全部设为已读” 2015-09-11 15:55:51 +08:00
huang 4d4b48ef99 Merge branch 'szzh' into dev_hjq
Conflicts:
	db/schema.rb
2015-09-11 15:50:10 +08:00
huang 6209250e6d 内容长度提醒 2015-09-11 15:45:25 +08:00
huang 8c0f9d24f8 系统消息没保存成功添加验证
系统消息样式修改
2015-09-11 15:39:46 +08:00