Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,449 Commits 2 Branches 0 Tags 163 MiB
Commit Graph

364 Commits

Author SHA1 Message Date
daiao 9dc48292eb 单选多选题 2017-09-14 18:45:19 +08:00
cxt b4d3a0114f 作业的设置 2017-09-14 16:46:46 +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
caishi 5039ce09d8 Merge branch 'develop' into dev_cs 2017-09-13 10:17:54 +08:00
cxt 9ab1b6d61f 第一次设置时有匿评保存，再修改普通作业的设置时去掉匿评后进行保存，点击无效 2017-09-12 16:26:13 +08:00
caishi 7f0bdd9c73 Merge branch 'develop' into dev_cs 
Conflicts:
	app/controllers/shixuns_controller.rb
	app/views/layouts/base_edu_course.html.erb
	app/views/shixuns/_shixun_top.html.erb
	app/views/shixuns/search_user_courses.js.erb
	public/stylesheets/css/edu-common.css
 2017-09-11 11:28:26 +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
caishi eb6844e293 Merge branch 'develop' into dev_cs 
Conflicts:
	app/views/challenges/edit.html.erb
	app/views/homework_common/_show_score_setting.html.erb
	app/views/homework_common/setting.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_edu.html.erb
	app/views/layouts/base_edu_course.html.erb
	app/views/shixuns/_send_shixuns.html.erb
	app/views/shixuns/_shixun_top.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-08 16:48:11 +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
caishi e7ae696dc8 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/show.html.erb
	app/views/homework_common/_homework_index_list.html.erb
 2017-09-07 17:16:04 +08:00
caishi 750c73c929 普通作业修改 2017-09-07 17:12:15 +08:00
cxt a5a68ba44a 班级的调整 2017-09-07 16:20:54 +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
caishi 359e041186 课堂动态和作业列表样式更新 2017-09-07 14:18:48 +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
cxt a087cc809a Merge branch 'dev_cxt' into develop 
Conflicts:
	app/views/courses/index.html.erb
	app/views/courses/index.js.erb
	app/views/subjects/_subject_list.html.erb
	app/views/subjects/show.html.erb
 2017-09-01 15:06:18 +08:00
miss 63fab43103 issue列表的完成 2017-09-01 14:59:35 +08:00
cxt 8cf4d0d49c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-01 14:59:25 +08:00
daiao 77ea22173e @myshixun.shixun.language == "Html" 2017-09-01 09:16:35 +08:00
daiao dfa5a1013e 获取等待时间 2017-08-31 17:16:59 +08:00
daiao 41c5300ecf 评测增加等待人数 2017-08-31 17:08:36 +08:00
cxt 406778632a 手机找回密码去掉滑块 2017-08-31 16:24:51 +08:00
cxt 75522ab120 在线课堂删除课程的联动更新：题库新建的tip和适用课程的输入可选列表，题库只显示普通和实训的作业 2017-08-30 14:39:44 +08:00
cxt 13d39379f8 Merge branch 'develop' into dev_cxt 2017-08-30 10:50:43 +08:00
cxt 43eafaf095 新建课堂修删除专业等信息，简洁化 2017-08-29 17:31:28 +08:00
miss 4c25c08ad4 调整 2017-08-29 09:14:14 +08:00
cxt baa512e4d7 作业设置的相关修改 2017-08-28 15:02:54 +08:00
miss eb2b736c45 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-28 11:10:44 +08:00
miss 4c0b2fc3a8 实训课程的学习须知，底部间距与头部间距保持一致 ，平台首页的相关tip更换新样式 2017-08-28 11:10:17 +08:00
cxt 1818885424 实训课程改为：实训路径 2017-08-28 09:14:09 +08:00
caishi f482b90cc2 实训点击事件 2017-08-25 21:42:16 +08:00
caishi 55d8fa7f13 Merge branch 'dev_cs' into develop 2017-08-25 21:40:01 +08:00
caishi e60329fc97 Merge branch 'develop' into dev_cs 2017-08-25 21:26:06 +08:00
caishi c4ac37cc4d 双点击事件 2017-08-25 21:19:20 +08:00
miss 78f50d70ca Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-25 20:46:10 +08:00
miss c234125ee5 主页tip样式修改。版本库及评测区域图标变换 2017-08-25 20:45:44 +08:00
cxt 1195f09b07 绑定邮箱点击打开新窗口 2017-08-25 20:22:20 +08:00
daiao ef0da2ebf6 修改上传附件删除按钮的位置 2017-08-25 19:56:17 +08:00
XuCheng642 d0181f80b7 Merge branch 'dev_xucheng' into develop 2017-08-25 16:25:12 +08:00
cxt a944456e57 Merge branch 'dev_cxt' into develop 
Conflicts:
	app/views/subjects/_subject_list.html.erb
 2017-08-25 16:13:46 +08:00
cxt 67ce988957 Merge branch 'dev_cs' into dev_cxt 2017-08-25 16:12:06 +08:00
XuCheng642 f54453f32c 管理员界面新增专业 2017-08-25 16:11:35 +08:00
cxt 5bd3e4a185 实训课程的调整 2017-08-25 16:11:21 +08:00
caishi b08d4da7f9 班级作业列表不够1页的高度调整 2017-08-25 15:55:23 +08:00
daiao c87c73d2ee 实训添加合作者报500 2017-08-25 15:29:49 +08:00
cxt 49bbd36c12 实训套件的改版 2017-08-24 20:01:34 +08:00
miss c16936ff4c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-24 16:37:02 +08:00
miss af72500077 成长中心的“技能标签”tab隐藏 
webssh的部分兼容问题
 2017-08-24 16:36:31 +08:00
daiao 123c0e57f8 没有评测通过时点击重新加载，中间的加载效果一直有 2017-08-24 10:35:42 +08:00
daiao 8111d82435 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-24 09:17:03 +08:00
daiao b0b6aa06e6 平台关于附件删除icon的显示需要统一调整 2017-08-24 09:16:43 +08:00
miss 404098149e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	app/views/games/_repository.html.erb
 2017-08-23 15:20:51 +08:00
miss 6ccd257f5a 缺省的测试区域不正常（360兼容问题） 
tip颜色的修改
 2017-08-23 15:02:04 +08:00
daiao e9f303b248 html渲染使用Iframes 2017-08-23 10:52:19 +08:00
daiao e9b7a98aba Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-23 09:42:57 +08:00
daiao f1c0b688a0 邮箱注册后没有激活，重新登录后跳到邮箱激活页面，点击帮助中心跳转500 2017-08-23 09:42:39 +08:00
XuCheng642 ce362108f5 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-23 09:25:00 +08:00
XuCheng642 bf01c1b4a8 issue的修改 2017-08-23 09:24:32 +08:00
cxt 696545889b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-08-22 16:27:41 +08:00
cxt 78f1fd3d1d 增加试用申请的留言功能 2017-08-22 16:27:28 +08:00