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

279 Commits

Author SHA1 Message Date
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
daiao a5289610a3 实训TPI的回复 2017-09-30 19:23:38 +08:00
cxt 0a5b79739a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 16:34:31 +08:00
cxt 91ba070ca8 Merge branch 'dev_cxt' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/messages/_course_show.html.erb
	app/views/student_work/index.html.erb
	public/stylesheets/css/taskstyle.css
 2017-09-30 16:33:07 +08:00
cxt 799d97d640 老师评阅 2017-09-30 14:36:17 +08:00
miss aa9ab75149 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-29 21:11:25 +08:00
miss 12cebcb252 学员统计板块的金币值模块以及其它问题的修改。tip样式的增加与修改 2017-09-29 21:10:56 +08:00
cxt f98f554aaf 试卷 2017-09-29 18:18:38 +08:00
XuCheng642 d679111b41 Merge branch 'develop' into dev_xucheng 
Conflicts:
	app/views/shixuns/_shixun_top.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-29 16:35:44 +08:00
XuCheng642 cbb648dd40 自动授权列表 2017-09-29 16:18:41 +08:00
daiao 82bb30622f 删除关卡报500 2017-09-27 08:47:48 +08:00
daiao 6e27beea08 选择题权限控制 2017-09-26 16:14:14 +08:00
daiao a1a045b135 选择题结构更改，保留用户多次评测的结果 2017-09-26 15:03:28 +08:00
daiao b7ce7e214e 学员统计报500 2017-09-25 09:34:45 +08:00
caishi a249e74526 字体颜色 2017-09-22 19:51:03 +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
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
cxt 48de3d1f35 实训作业成绩的实时更新 2017-09-22 14:36:01 +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 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 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
cxt 0b38eca942 实训作业的完成情况实时更新 2017-09-21 15:50:08 +08:00
cxt ac667c5583 教辅申请加入课堂、老师批准，请给教师发留言 2017-09-20 11:09:32 +08:00
huang 8cd9ff0a53 修复实训选题相关问题 2017-09-19 14:26:29 +08:00
cxt 3d0f1839a7 Merge branch 'dev_cs' 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:05:56 +08:00
cxt b0cab589ac Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 21:02:48 +08:00
daiao 7ac17f10bd Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 19:29:09 +08:00
daiao 550f152e27 单选多选题 2017-09-15 19:28:19 +08:00
XuCheng642 ac28f83271 Merge branch 'develop' into dev_xucheng 
Conflicts:
	app/controllers/managements_controller.rb
	app/helpers/application_helper.rb
	app/views/subjects/_subject_list.html.erb
	config/routes.rb
 2017-09-15 18:35:37 +08:00
cxt c9216387a6 学生退出班级后再重新加入班级无法提交作品 2017-09-15 16:31:22 +08:00
huang 3e07f18be5 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_all_student_list.html.erb
 2017-09-15 10:55:32 +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
huang 0f2bb1734f excel解析用户 2017-09-14 19:58:13 +08:00
XuCheng642 f9e4385226 问题修改2017 09 11 2017-09-14 19:24:47 +08:00
daiao ab3cfc69bd TPI单选多选题，全部列表刷新 2017-09-14 18:59:41 +08:00
daiao 2c7e5d1f38 TPI单选多选题 2017-09-14 17:30:58 +08:00
daiao f79a40ca65 单选多选题 2017-09-13 16:01:18 +08:00
daiao a27f10d884 选择题的新建和详情页面 2017-09-12 09:05:51 +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
huang 2b1516558f Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 15:53:47 +08:00
cxt a376140d75 Merge branch 'dev_cxt' into develop 2017-09-08 15:50:21 +08:00
huang 159a91878f 解决异常问题 2017-09-08 15:49:48 +08:00
cxt a8cf183944 完成实训作业的自动评分功能 2017-09-08 15:48:35 +08:00