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

222 Commits

Author SHA1 Message Date
daiao 7c024985bf 单选多选题答题模式修改 2017-09-25 11:16:16 +08:00
huang 89b2c76ad2 修复403问题 2017-09-22 22:51:44 +08:00
huang 0da3fa675f 修复403问题 2017-09-22 22:38:39 +08:00
huang 464c32a379 实训学员统计排序倒序 2017-09-22 20:54:43 +08:00
huang 5a8578b2cf 添加已发布实训页面不能编辑代码功能 2017-09-22 20:34:30 +08:00
huang 2ac8536575 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 19:05:56 +08:00
huang 759cda61b9 实训复制权限及复制的时候没有复制适用课程 2017-09-22 19:05:37 +08:00
miss e3b64c1e26 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	public/stylesheets/css/ketang.css
#	public/stylesheets/css/taskstyle.css
 2017-09-22 17:17:51 +08:00
caishi 78874ff0cc Merge branch 'dev_cs' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/helpers/student_work_helper.rb
	app/views/courses/sync_students.js.erb
 2017-09-22 17:12:37 +08:00
miss 71656f27c3 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	app/views/games/_shixun_comment_block.html.erb
 2017-09-22 16:43:07 +08:00
daiao d9b35e1f5c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 15:47:59 +08:00
miss 9076facbca Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	app/views/shixuns/settings.html.erb
 2017-09-22 14:50:53 +08:00
miss 76a3026f97 step3学员统计板块，二次回复的提示，作品页样式的调整，实训tpm配置页面上边线没有阴影。我的关注以及我的粉丝页面样式及tip问题，编辑作业给出的错误提示框无法关闭的问题，新建作业时显示的下拉列表的文字错乱问题，我的题库详情页面的菜单按钮的位置调整，班级所有页面的阴影背景色的修改。个人主页，实训，课程的tab的统一，班级成员管理的tip出现条件以及出现位置的修改 2017-09-22 14:47:53 +08:00
huang 35a1c8b9c2 实训开启评测83问题 2017-09-22 11:23:57 +08:00
daiao f6f3960ba4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 11:15:47 +08:00
daiao 7570a83142 实训里的反馈，要标明是对哪一关 2017-09-22 11:15:18 +08:00
huang 6f8491ca94 实训复制成功给出提醒 2017-09-22 11:00:08 +08:00
huang 29acff9dde 去掉抛出异常 2017-09-22 10:58:15 +08:00
huang a234bdc01b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 10:47:41 +08:00
cxt eced528c8f 把已发布的路径排在最前面 2017-09-22 10:19:59 +08:00
huang 3df0b71d0f 复制的时候添加错误提醒 2017-09-22 10:09:34 +08:00
huang 8457e4d784 完成实训的复制功能 2017-09-22 09:52:13 +08:00
cxt 86e2f60946 Merge branch 'develop' into dev_cxt 
Conflicts:
	app/controllers/shixuns_controller.rb
	app/views/subjects/new.html.erb
	public/javascripts/edu/base_edu.js
 2017-09-21 17:46:58 +08:00
huang 84643fe2cb 实训复制添加可配置功能 2017-09-21 17:25:51 +08:00
huang 945a3772e6 实训复制完善 2017-09-21 16:50:13 +08:00
huang f88bc764bb 实训关卡、测试集、tag复制 2017-09-21 15:20:39 +08:00
daiao e86720be6b 全部实训最新的排序不正确 2017-09-20 10:19:41 +08:00
daiao d1cf530237 实训首页的全部显示的数据和检索的数据不一致，全部显示的数据不算隐藏的 2017-09-20 10:00:47 +08:00
huang fcf78d07dd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-19 17:25:15 +08:00
huang 66ef740235 复制注释 2017-09-19 17:25:03 +08:00
caishi a09450a805 Merge branch 'dev_cs' into develop 
Conflicts:
	app/views/games/_choice_question.html.erb
 2017-09-19 17:17:40 +08:00
caishi df60c289ad 选择题选项换行、开始实战的加载层 2017-09-19 17:15:50 +08:00
cxt c6960002c5 实训路径的最热需要把已发布的排在最前面 2017-09-19 15:15:16 +08:00
huang 3412a69c3b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	Gemfile
 2017-09-18 15:26:18 +08:00
huang fcaa798620 注释掉提交代码hook触发事件 2017-09-18 15:25:34 +08:00
daiao 71d2c18442 修改实训技术平台后，需要重新生成TPM脚本 2017-09-18 14:21:29 +08:00
huang bfe758be78 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/challenges/_single_or_multiple_question.html.erb
	app/views/messages/_common_reply_box.html.erb
	app/views/praise_tread/_edu_praise.html.erb
	app/views/student_work/_common_reply_box.html.erb
 2017-09-15 21:13:14 +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
cxt c205c373a3 Merge branch 'develop' into dev_cs 
Conflicts:
	app/controllers/shixuns_controller.rb
	app/views/challenges/edit.html.erb
	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-13 16:19:33 +08:00
cxt e87bc406a6 添加日志 2017-09-12 17:32:50 +08:00
cxt 847a78620f 实训发送至报500 2017-09-12 17:05:21 +08:00
cxt 4c7eb01bbf 实训tpm的发送至的弹框中的数据少了新建课堂的 2017-09-11 15:14:19 +08:00
cxt d36a95d90c 实训的多个课程关联 2017-09-11 10:36:12 +08:00
cxt f457d87755 实训首页的检索 2017-09-08 20:30:25 +08:00
daiao df1e8988b3 实训发送至功能 2017-09-08 17:05:07 +08:00
huang 234a8d7f7d 解决版本库类型更新不成功的问题 2017-09-08 15:53:32 +08:00
huang 159a91878f 解决异常问题 2017-09-08 15:49:48 +08:00
huang 9fe9095837 优化开启实训方法；解决实训偶尔被fork多次的问题；解决开启实训的时候版本库为空的问题 2017-09-08 14:53:36 +08:00
cxt 3c79e6fc4e Merge branch 'dev_cxt' into dev_cs 
Conflicts:
	app/views/challenges/edit.html.erb
	app/views/shixuns/_send_shixuns.html.erb
	app/views/shixuns/_shixun_top.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-07 16:23:11 +08:00