Commit Graph

309 Commits

Author SHA1 Message Date
miss ac2af05d28 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 18:13:14 +08:00
daiao ec22bbe0c1 Merge branch 'develop' into dev_daiao
Conflicts:
	app/controllers/games_controller.rb
	app/views/challenges/edit.html.erb
	app/views/games/_game_show.html.erb
	public/stylesheets/css/edu-common.css
2017-09-15 09:10:36 +08:00
miss 25cb688ace 测试集前端显示空格及提示语 2017-09-15 09:08:01 +08:00
daiao 9dc48292eb 单选多选题 2017-09-14 18:45:19 +08:00
miss 7ddaa7a9ee tab公共样式的替换 2017-09-14 09:55:28 +08:00
miss 34d464bf41 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
#	app/views/users/show.html.erb
#	config/routes.rb
#	public/stylesheets/css/edu-common.css
2017-09-14 09:14:55 +08:00
miss 14209be057 添加学生弹框样式问题,实训tpm版本库页面。模块之间需要有距离,ta的主页样式问题,我的资料页去除灰色背景并调整间距,成长中心的表格样式修正
我的主页和各个功能首页的左侧功能条,部分点击事项更改为直接刷新显示
个人主页的问题反馈,点击进入超级管理员的留言页面()
我的题库和公共题库页尾显示的内容,请保持区域内上下居中
实训和课堂搜索后,无数据时的内容区域与文字要有间距
实训的配置页面不需要重复显示版本库
个人主页、我的课堂和我的实训的新建、加入按钮样式与各首页保持一致
我的留言、给TA留言和私信的页面需要去掉背景灰色和加边框阴影
在线课堂首页的搜索tip需要更换新样式,课堂名称显示全的话不显示tip,带有省略号的话需要有tip
2017-09-14 09:09:12 +08:00
daiao f79a40ca65 单选多选题 2017-09-13 16:01:18 +08:00
cxt 9ab1b6d61f 第一次设置时有匿评保存,再修改普通作业的设置时去掉匿评后进行保存,点击无效 2017-09-12 16:26:13 +08:00
daiao 2111ad8f0d 解决火狐浏览器要点击2次才能聚焦 2017-09-10 11:59:26 +08:00
XuCheng642 3a97d3e112 样式修改 2017-09-10 11:29:34 +08:00
XuCheng642 3041176da9 阴影 2017-09-08 20:31:52 +08:00
XuCheng642 dca722c5dd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into dev_xucheng
Conflicts:
	app/views/syllabuses/index.html.erb
2017-09-08 19:11:24 +08:00
XuCheng642 c2f09a4989 issue修改 2017-09-08 18:35:45 +08:00
miss 3a874f6cf1 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 15:53:21 +08:00
miss 5fffcfdc3d 实训tpi页面代码过多时拖拽卡顿。
TPM提示语的修改
我的主页中粉丝板块边框和内容的处理
实训TPM配置页的tab修改
实训TPM各个板块间的距离修改。
班级所有页面背景色的修改及各个板块阴影的增加
实训路径中已发布实训的提示语的修改。
2017-09-08 15:52:50 +08:00
cxt a376140d75 Merge branch 'dev_cxt' into develop 2017-09-08 15:50:21 +08:00
daiao 0bc86d9bd7 实训TPI的评测按钮区域新增“上一关” 2017-09-08 11:21:08 +08:00
cxt dcf26e0fb3 作业设置页面的截止时间和结束时间在选择了发布时间后给出初始值 2017-09-08 09:51:12 +08:00
daiao e3543d3b73 iframe拉动实践 2017-09-08 09:28:26 +08:00
daiao 918d6b3c95 实训类型 2017-09-07 20:35:30 +08:00
daiao d924b60d7d 制表符未匹配的问题 2017-09-07 20:02:33 +08:00
daiao ca8be6b77a 评测代码结果分类 2017-09-07 14:56:42 +08:00
daiao 6f8a94463d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-07 14:22:34 +08:00
daiao 0b1f6f5378 实训TPI代码评测修改为代码抛异常和代码实际输出与测试集输出不匹配2种类型 2017-09-07 14:22:12 +08:00
cxt e30cbff41c 在新建课堂页面,输入号课程名称和课堂名称后,点击一下课程名称输入框,课堂名称的后缀就会消失 2017-09-07 10:25:32 +08:00
huang 2d5b255d52 评测数据显示问题 2017-09-06 16:33:09 +08:00
huang 29ad462f17 解决评测信息有误解及评测结果不明确问题 2017-09-06 16:23:19 +08:00
huang 9c4110af19 实训路径中开启实训弹出新弹框被阻止问题 2017-09-06 16:02:12 +08:00
daiao 0b729ad2e0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-05 17:39:16 +08:00
daiao 2daf1d9c24 评测 2017-09-05 17:38:59 +08:00
cxt 04bc8c4b42 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-05 17:06:28 +08:00
cxt 134cedf3d2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-05 17:02:19 +08:00
cxt c16b08c63b 取消学生职业认证中的上传图片 2017-09-05 14:46:19 +08:00
cxt ef3c4f1d51 简化统一实训和课堂的专业及课程名称 2017-09-05 11:03:49 +08:00
miss 3b4a9c7821 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-05 09:41:49 +08:00
miss 4b81715054 几个issue的修改完善 2017-09-05 09:40:37 +08:00
daiao d2482b64e1 邮箱注册时企业邮箱无法查看 2017-09-05 09:28:45 +08:00
cxt 9cecf10829 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-04 16:59:03 +08:00
huang 46b3b8085b game、评测统计显示问题 2017-09-04 16:39:36 +08:00
cxt 3d38b61670 教师列表首次点击时未突出显示 2017-09-04 14:21:46 +08:00
miss d59e7b7cea Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-04 08:59:05 +08:00
miss e3b6f9f66f 小笔样式替换 2017-09-04 08:58:28 +08:00
daiao b1354af656 空格问题 2017-09-03 18:09:42 +08:00
daiao 92c091d2e2 TPI测试集空格样式更改 2017-09-03 17:59:48 +08:00
daiao 871f02a40f 上线缺陷修复 2017-09-03 17:37:29 +08:00
daiao d58c776514 TPI预计输出与实际输出空格样式调整 2017-09-03 16:40:32 +08:00
cxt 8254251670 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-01 15:22:10 +08:00
miss 89078e6ff9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
#	app/views/games/_code_actions.html.erb
#	public/javascripts/edu/edu_tpi.js
2017-09-01 15:11:02 +08:00
miss fa6faad26d 新增单位界面 2017-09-01 15:06:34 +08:00