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

1012 Commits

Author SHA1 Message Date
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 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
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
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
caishi c2dec1bddc Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-15 20:12:52 +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 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
miss ac2af05d28 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 18:13:14 +08:00
caishi e138c204e0 分班 2017-09-15 17:08:16 +08:00
cxt c9216387a6 学生退出班级后再重新加入班级无法提交作品 2017-09-15 16:31:22 +08:00
cxt 508139c57c 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 15:12:09 +08:00
cxt 6469fc1563 课堂的调整 2017-09-15 15:10:35 +08:00
daiao 02861c3bd2 单选多选题缺陷修复 2017-09-15 11:23:24 +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
huang 63cd1ba6ab 新 2017-09-15 10:50:05 +08:00
daiao a6845d79b0 Merge branch 'dev_daiao' into develop 2017-09-15 10:40:05 +08:00
daiao 0204232e49 导出excel 2017-09-15 10:39:07 +08:00
caishi efd402bed5 Merge branch 'dev_daiao' into dev_cs 
Conflicts:
	app/views/challenges/edit.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-15 09:29:42 +08:00
daiao d2e03de9eb 匿评作业报500 2017-09-15 09:13:28 +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
daiao a67f4ca0f7 实训单选多选题TPM优化 2017-09-14 19:41:30 +08:00
XuCheng642 d33e79dc86 Merge branch 'develop' into dev_xucheng 
Conflicts:
	app/controllers/managements_controller.rb
 2017-09-14 19:30:36 +08:00
XuCheng642 f9e4385226 问题修改2017 09 11 2017-09-14 19:24:47 +08:00
daiao 9dc48292eb 单选多选题 2017-09-14 18:45:19 +08:00
daiao 2c7e5d1f38 TPI单选多选题 2017-09-14 17:30:58 +08:00
cxt b4d3a0114f 作业的设置 2017-09-14 16:46:46 +08:00
cxt 86f6bbcac8 课堂相关调整 2017-09-14 14:48:04 +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
huang b5f8da0ece Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-13 17:17:01 +08:00