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

22184 Commits

Author SHA1 Message Date
caishi 20c816cab0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 22:59:24 +08:00
caishi efdf12c5f7 发送资源 2017-09-15 22:58:56 +08:00
cxt a412a42976 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/helpers/courses_helper.rb
 2017-09-15 22:53:47 +08:00
cxt a6d393d3af 试用申请弹框修改 2017-09-15 22:51:32 +08:00
caishi 174cca8e6d Merge branch 'dev_cs' into develop 2017-09-15 22:46:13 +08:00
caishi 9a7af9a50a Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-15 22:45:05 +08:00
caishi a4d0c65cad 课堂样式 2017-09-15 22:44:36 +08:00
cxt 9b52184106 我的题库页面的搜索，回车无效 2017-09-15 22:44:17 +08:00
cxt 61f1d9bd10 课堂相关修改 2017-09-15 22:35:36 +08:00
daiao 29715236da 凡是没有权限的，要判断是否已经登陆 2017-09-15 22:30:26 +08:00
daiao a4ce02dc37 我的主页，4个认真icon应该有链接进入想要的页面 2017-09-15 22:17:34 +08:00
daiao ba10e51b6f 实训路径的icon数据对应为零，则不显示 2017-09-15 22:08:20 +08:00
daiao 6ea28b66b7 全部实训的首页，在tab右侧增加显示检索结构数量提示 2017-09-15 21:57:03 +08:00
daiao cee7201934 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 21:42:17 +08:00
daiao 25475693ce 实训版本库的提交和分支应该是整块有点击事项，而不是只在数字上 2017-09-15 21:42:03 +08:00
miss 50ccbbb9de 主页tab样式调整 2017-09-15 21:28:31 +08:00
cxt cbef08f099 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 21:25:37 +08:00
cxt 3a394315a4 班级头部的学生列表链接更新 2017-09-15 21:25:16 +08:00
daiao 92e1a475bc Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 21:14:26 +08:00
daiao d03c4d568b 单选多选题缺陷修复 2017-09-15 21:14:17 +08:00
huang 3fb91e19a7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 21:13:32 +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
huang 45e9155eb9 Merge branch 'dev_cs' into develop 2017-09-15 21:08:48 +08:00
cxt be1e82a52b gemfile 2017-09-15 21:07:47 +08:00
huang 17886c7313 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-15 21:06:59 +08:00
huang 04d2067b0e 解决版本库500问题 2017-09-15 21:06:42 +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
cxt a69dc16af5 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/settings/_all_student_list_block.html.erb
 2017-09-15 21:02:10 +08:00
cxt d2d388972a 班级页面的分班 2017-09-15 20:59:35 +08:00
daiao 53b015606c 单选多选题错误提示修改 2017-09-15 20:53:41 +08:00
daiao f659047c4d 试用申请待处理期间，增加弹框提示 2017-09-15 20:45:00 +08:00
daiao 39b16c9d29 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 20:32:30 +08:00
daiao 0a1359d7a3 检索为空时，点击点击叉叉，也会刷新页面 2017-09-15 20:32:15 +08:00
miss 5d9ec8bf0c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 20:24:17 +08:00
miss c51832e2bd tip样式的调整 2017-09-15 20:23:49 +08:00
daiao c6a7362051 在线课堂的加入学生、老师弹框，实训tpm的添加合作者显示的用户职业不正确 2017-09-15 20:20:01 +08:00
caishi c2dec1bddc Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-15 20:12:52 +08:00
caishi c841ec27ba 选择题 2017-09-15 20:12:24 +08:00
huang 9f10b14466 合并代码后添加入口 2017-09-15 19:41:10 +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
huang 730e8264c0 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/controllers/courses_controller.rb
	app/views/courses/settings/_all_student_list.html.erb
 2017-09-15 19:09:31 +08:00
huang d713ce6de0 批量导入Excel文件到课程列表 2017-09-15 19:03:36 +08:00
cxt a16533278a Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-15 18:44:52 +08:00
cxt e5a2347675 资源的设置 2017-09-15 18:44:34 +08:00
XuCheng642 2d1a24ea68 Merge branch 'dev_xucheng' into develop 2017-09-15 18:38:29 +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
caishi 2f52d3456e Merge branch 'dev_daiao' into dev_cs 2017-09-15 18:29:34 +08:00
caishi 8d42926389 选择题编辑、详情 2017-09-15 18:28:30 +08:00