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

214 Commits

Author SHA1 Message Date
miss 5af447875e ajax加载层级调整 2017-09-24 10:34:48 +08:00
caishi a249e74526 字体颜色 2017-09-22 19:51:03 +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 328ad9546a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-22 17:21:05 +08:00
cxt 21b1fc32d9 Merge branch 'dev_cxt' into develop 
Conflicts:
	app/views/student_work/show.html.erb
 2017-09-22 17:20:25 +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
cxt 758d1bf39d 作品匿评的调整 2017-09-22 17:04:40 +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
caishi b4b296d130 Merge branch 'develop' into dev_cs 
Conflicts:
	app/views/challenges/_single_or_multiple_question_show.html.erb
 2017-09-22 08:51:34 +08:00
XuCheng642 ad993b64d1 管理员界面消息列表 2017-09-21 20:59:39 +08:00
caishi 219ff96ea0 增加在线课堂的教师或者助教待审批提醒，且更换样式 2017-09-21 18:29:07 +08:00
caishi 9bdcfc6b9d body样式 2017-09-21 14:21:50 +08:00
caishi b5c7c5a8d8 班级添加学生、教师默认只添加与主讲人所在单位一致的学生 2017-09-21 11:19:44 +08:00
daiao 386a7b4d06 实训tpi的评论数字样式不对 2017-09-21 10:00:05 +08:00
caishi da6d67eb35 动态资源列表、讨论列表调整 2017-09-20 14:27:13 +08:00
caishi 3eb85ee6f9 问吧 2017-09-19 09:12:47 +08:00
caishi c465776416 帖子详情 2017-09-17 11:06:22 +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
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
miss ac2af05d28 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 18:13:14 +08:00
caishi 26e88c72f0 作业列表页面修改 2017-09-15 15:23:51 +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
miss 7ddaa7a9ee tab公共样式的替换 2017-09-14 09:55:28 +08:00
caishi e654e8107f 分班页面 2017-09-13 16:00:47 +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
huang a7db6441b8 样式问题 2017-09-10 12:14:14 +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
XuCheng642 c2f09a4989 issue修改 2017-09-08 18:35:45 +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
caishi 750c73c929 普通作业修改 2017-09-07 17:12:15 +08:00
caishi 659a7b3ef5 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-09-07 14:19:36 +08:00
caishi 359e041186 课堂动态和作业列表样式更新 2017-09-07 14:18:48 +08:00
cxt cbb6b2175f Merge branch 'dev_xucheng' into develop 
Conflicts:
	public/javascripts/edu/edu_tpi.js
	public/stylesheets/css/edu-public.css
 2017-09-06 10:52:47 +08:00
cxt a96c8b8489 我的课堂调整 2017-09-06 10:51:34 +08:00
XuCheng642 2a58193e8f Merge branch 'dev_xucheng' of https://bdgit.trustie.net/hushasha/bigdata into dev_xucheng 2017-09-06 09:35:00 +08:00
XuCheng642 d8974ef184 issue修改 2017-09-06 09:26:19 +08:00
cxt 4bb1498322 实训的发送至 2017-09-05 17:01:28 +08:00
cxt ef3c4f1d51 简化统一实训和课堂的专业及课程名称 2017-09-05 11:03:49 +08:00
caishi 1fef87f098 Merge branch 'develop' into dev_cs 
Conflicts:
	app/views/challenges/_content_list.html.erb
	app/views/challenges/edit.html.erb
	public/stylesheets/css/edu-common.css
 2017-09-04 14:42:44 +08:00
caishi 2f105cc476 实训TPM页面微调 2017-09-04 14:25:23 +08:00
caishi d9fbbddd55 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-01 11:22:22 +08:00
caishi 65878938fc 实训路径样式修改 2017-09-01 11:17:02 +08:00
daiao 2b075837fb Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/users/search_shixuns_or_courses.html.erb
 2017-08-31 15:25:47 +08:00