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

255 Commits

Author SHA1 Message Date
daiao 236445e368 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 22:02:25 +08:00
daiao 880f9a7c06 还原TPI回复功能 2017-09-30 22:02:04 +08:00
daiao 49ffc348e2 Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/games/_shixun_comment_list.html.erb
 2017-09-30 21:40:23 +08:00
huang a3c8e28c52 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:40:12 +08:00
huang a9c5a42594 实训修改代码不重置 2017-09-30 21:37:43 +08:00
daiao e00bb90c23 Merge branch 'develop' into dev_daiao 
Conflicts:
	app/views/games/_shixun_comment_list.html.erb
	app/views/layouts/_logined_header.html.erb
 2017-09-30 19:51:30 +08:00
huang b2304597b4 实训路径文件目录选择 2017-09-30 19:25:35 +08:00
daiao a5289610a3 实训TPI的回复 2017-09-30 19:23:38 +08:00
huang 47439cb94d Merge branch 'develop' into dev_huang 
Conflicts:
	app/controllers/shixuns_controller.rb
 2017-09-30 18:43:16 +08:00
huang e38cee66b8 文件目录 2017-09-30 18:12:25 +08:00
huang 2ee93c73f6 Merge branch 'dev_new_gitlab_huang' into develop 2017-09-30 16:48:40 +08:00
huang 90ade97d88 开启挑战的时候将educoder加入到myshixun中 2017-09-30 16:38:38 +08:00
miss 5afcbb72c6 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	app/controllers/shixuns_controller.rb
#	public/stylesheets/css/edu-public.css
 2017-09-30 16:18:36 +08:00
huang cba5c75ba0 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-09-30 15:37:01 +08:00
huang b54362162c Merge branch 'develop' into dev_huang 2017-09-30 15:36:48 +08:00
miss c8262cfeaa 文件路径的弹框 2017-09-30 15:32:27 +08:00
miss 88b5a20c47 分页个数 2017-09-30 10:50:12 +08:00
miss adb0aa3f66 文件路径弹框 2017-09-30 10:48:43 +08:00
huang 3c19e12081 实训版本库代码同步功能 2017-09-30 10:42:26 +08:00
miss 12cebcb252 学员统计板块的金币值模块以及其它问题的修改。tip样式的增加与修改 2017-09-29 21:10:56 +08:00
miss dfe5fe828e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-29 11:11:01 +08:00
huang e46c4a57e3 发布了修改版本也会触发事件 2017-09-28 16:20:05 +08:00
miss 3602ecfad2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-28 16:11:02 +08:00
miss e070769613 tip调整 2017-09-28 16:10:26 +08:00
huang fad2fb478f 实训复制失败添加日志区分 2017-09-28 14:12:42 +08:00
huang 3ce5368a9a 老师角色 2017-09-28 11:29:05 +08:00
huang 76cd81ec8e 复制权限修改 2017-09-28 11:11:15 +08:00
miss 74f97f79ad 文件路径的弹框 2017-09-27 15:09:18 +08:00
huang 3ec5a7991f 已发布的实训如果修改实训的“技术平台”不触发强制重置 2017-09-26 15:47:31 +08:00
huang ce9630b6cd 文件路径 2017-09-26 10:01:03 +08:00
huang ec56f1f05a 文件目录 2017-09-25 16:50:51 +08:00
miss b631935c30 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-25 16:50:05 +08:00
miss d33cbbb699 issue列表的修改 2017-09-25 16:49:35 +08:00
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