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

337 Commits

Author SHA1 Message Date
daiao a5289610a3 实训TPI的回复 2017-09-30 19:23:38 +08:00
daiao aa4ec780b7 讨论详情页二级回复功能 2017-09-28 17:29:36 +08:00
XuCheng642 23550b8923 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/controllers/managements_controller.rb
 2017-09-22 18:48: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
miss 76a3026f97 step3学员统计板块，二次回复的提示，作品页样式的调整，实训tpm配置页面上边线没有阴影。我的关注以及我的粉丝页面样式及tip问题，编辑作业给出的错误提示框无法关闭的问题，新建作业时显示的下拉列表的文字错乱问题，我的题库详情页面的菜单按钮的位置调整，班级所有页面的阴影背景色的修改。个人主页，实训，课程的tab的统一，班级成员管理的tip出现条件以及出现位置的修改 2017-09-22 14:47:53 +08:00
cxt c71ca7b5a8 课堂的帖子列表增加菜单 2017-09-22 09:50:44 +08:00
XuCheng642 ad993b64d1 管理员界面消息列表 2017-09-21 20:59:39 +08:00
caishi b5c7c5a8d8 班级添加学生、教师默认只添加与主讲人所在单位一致的学生 2017-09-21 11:19:44 +08:00
caishi da6d67eb35 动态资源列表、讨论列表调整 2017-09-20 14:27:13 +08:00
miss d1c6129271 主页、以及题库tab位置调整，tip位置的调整 2017-09-18 08:41:06 +08:00
miss 5ee33d6f8e 前端测试集的显示语提示语 2017-09-17 15:12:38 +08:00
cxt 0f3034e6c7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 23:31:35 +08:00
cxt 1f1fbbfb27 发送帖子失败 2017-09-15 23:31:22 +08:00
caishi 27645d172d 个人成长记录中心-金币 2017-09-15 23:14:17 +08:00
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
caishi 174cca8e6d Merge branch 'dev_cs' into develop 2017-09-15 22:46:13 +08:00
caishi a4d0c65cad 课堂样式 2017-09-15 22:44:36 +08:00
cxt 61f1d9bd10 课堂相关修改 2017-09-15 22:35:36 +08:00
daiao a4ce02dc37 我的主页，4个认真icon应该有链接进入想要的页面 2017-09-15 22:17:34 +08:00
miss 50ccbbb9de 主页tab样式调整 2017-09-15 21:28:31 +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 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
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 8d42926389 选择题编辑、详情 2017-09-15 18:28:30 +08:00
XuCheng642 1240c50cb5 班级帖子发送样式 2017-09-15 18:17:19 +08:00
caishi 990480e29b Merge branch 'develop' into dev_cs 2017-09-15 09:05:25 +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
caishi 3a6c508aeb 帖子详情 2017-09-14 17:07:18 +08:00
cxt 86f6bbcac8 课堂相关调整 2017-09-14 14:48:04 +08:00
miss 7ddaa7a9ee tab公共样式的替换 2017-09-14 09:55:28 +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
daiao 91f141d9b8 个人主页“我的实训”新建不打开新窗口，请直接刷新显示 2017-09-13 16:30:36 +08:00
caishi d67eb13c9b 在线课堂页面的更新 2017-09-13 10:16:35 +08:00
caishi 7a65852945 课程资源、讨论 2017-09-11 16:52:58 +08:00
caishi 7f0bdd9c73 Merge branch 'develop' into dev_cs 
Conflicts:
	app/controllers/shixuns_controller.rb
	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-11 11:28:26 +08:00
XuCheng642 3041176da9 阴影 2017-09-08 20:31:52 +08:00
XuCheng642 b769ab9fc6 Merge branch 'dev_xucheng' into develop 
Conflicts:
	public/stylesheets/css/edu-common.css
 2017-09-08 19:20:14 +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
daiao 93ad5e97fb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 19:02:55 +08:00
XuCheng642 c2f09a4989 issue修改 2017-09-08 18:35:45 +08:00
miss 0e26787d0d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 17:41:26 +08:00
miss 0ba7685bf3 issue修改 2017-09-08 17:41:05 +08:00
daiao df1e8988b3 实训发送至功能 2017-09-08 17:05:07 +08:00
caishi eb6844e293 Merge branch 'develop' into dev_cs 
Conflicts:
	app/views/challenges/edit.html.erb
	app/views/homework_common/_show_score_setting.html.erb
	app/views/homework_common/setting.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_edu.html.erb
	app/views/layouts/base_edu_course.html.erb
	app/views/shixuns/_send_shixuns.html.erb
	app/views/shixuns/_shixun_top.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-08 16:48:11 +08:00
caishi 0f29107dac 课堂设置、新建页面更新 2017-09-08 16:38:00 +08:00
daiao 6ac212a849 Merge branch 'dev_xucheng' into develop 2017-09-08 15:55:18 +08:00