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

290 Commits

Author SHA1 Message Date
caishi a09450a805 Merge branch 'dev_cs' into develop 
Conflicts:
	app/views/games/_choice_question.html.erb
 2017-09-19 17:17:40 +08:00
caishi df60c289ad 选择题选项换行、开始实战的加载层 2017-09-19 17:15:50 +08:00
daiao 63aed6be25 C语言评测实际输出与中间层统一 2017-09-18 10:12:50 +08:00
daiao 09b3e5dc46 测试集特殊字符匹配 2017-09-18 08:44:08 +08:00
daiao 7454ce85b7 实训测试集 2017-09-17 16:43:36 +08:00
daiao 752210f0fc 实际输出 2017-09-17 16:31:17 +08:00
daiao 055a254811 测试集样式修改 2017-09-17 11:24:57 +08:00
daiao 39064be34b 刷新测试集提示样式修改 2017-09-17 11:08:03 +08:00
cxt 61f1d9bd10 课堂相关修改 2017-09-15 22:35:36 +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 d2d388972a 班级页面的分班 2017-09-15 20:59:35 +08:00
miss c51832e2bd tip样式的调整 2017-09-15 20:23:49 +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
XuCheng642 1240c50cb5 班级帖子发送样式 2017-09-15 18:17:19 +08:00
miss ac2af05d28 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 18:13:14 +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
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 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 25cb688ace 测试集前端显示空格及提示语 2017-09-15 09:08:01 +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
cxt b4d3a0114f 作业的设置 2017-09-14 16:46:46 +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 f79a40ca65 单选多选题 2017-09-13 16:01:18 +08:00
caishi 5039ce09d8 Merge branch 'develop' into dev_cs 2017-09-13 10:17:54 +08:00
cxt 9ab1b6d61f 第一次设置时有匿评保存，再修改普通作业的设置时去掉匿评后进行保存，点击无效 2017-09-12 16:26:13 +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
daiao 2111ad8f0d 解决火狐浏览器要点击2次才能聚焦 2017-09-10 11:59:26 +08:00
XuCheng642 3a97d3e112 样式修改 2017-09-10 11:29:34 +08:00
XuCheng642 3041176da9 阴影 2017-09-08 20:31:52 +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
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
miss 3a874f6cf1 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-08 15:53:21 +08:00
miss 5fffcfdc3d 实训tpi页面代码过多时拖拽卡顿。 
TPM提示语的修改
我的主页中粉丝板块边框和内容的处理
实训TPM配置页的tab修改
实训TPM各个板块间的距离修改。
班级所有页面背景色的修改及各个板块阴影的增加
实训路径中已发布实训的提示语的修改。
 2017-09-08 15:52:50 +08:00
cxt a376140d75 Merge branch 'dev_cxt' into develop 2017-09-08 15:50:21 +08:00
daiao 0bc86d9bd7 实训TPI的评测按钮区域新增“上一关” 2017-09-08 11:21:08 +08:00
cxt dcf26e0fb3 作业设置页面的截止时间和结束时间在选择了发布时间后给出初始值 2017-09-08 09:51:12 +08:00
daiao e3543d3b73 iframe拉动实践 2017-09-08 09:28:26 +08:00
daiao 918d6b3c95 实训类型 2017-09-07 20:35:30 +08:00
daiao d924b60d7d 制表符未匹配的问题 2017-09-07 20:02:33 +08:00
caishi e7ae696dc8 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 
Conflicts:
	app/views/courses/show.html.erb
	app/views/homework_common/_homework_index_list.html.erb
 2017-09-07 17:16:04 +08:00
caishi 750c73c929 普通作业修改 2017-09-07 17:12:15 +08:00
cxt a5a68ba44a 班级的调整 2017-09-07 16:20:54 +08:00
daiao ca8be6b77a 评测代码结果分类 2017-09-07 14:56:42 +08:00
daiao 6f8a94463d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-07 14:22:34 +08:00