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

178 Commits

Author SHA1 Message Date
huang c6c9507abe 文件目录添加根目录 2017-09-30 20:41:05 +08:00
cxt 91ba070ca8 Merge branch 'dev_cxt' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/messages/_course_show.html.erb
	app/views/student_work/index.html.erb
	public/stylesheets/css/taskstyle.css
 2017-09-30 16:33:07 +08:00
caishi f8320101a5 TPI遮罩层 2017-09-30 14:53:58 +08:00
cxt 799d97d640 老师评阅 2017-09-30 14:36:17 +08:00
huang 3c19e12081 实训版本库代码同步功能 2017-09-30 10:42:26 +08:00
caishi f6aad05821 系统提示性弹框的文字请统一改为黑色333 
实训TPM待审核状态的tip修改
 2017-09-29 15:56:17 +08:00
miss a423955eb4 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-28 10:43:49 +08:00
miss ae4c134953 tip问题的解决 2017-09-27 17:41:01 +08:00
caishi 4b86e27630 搜索框外加一部分Issues 2017-09-27 16:23:19 +08:00
caishi 587e1ab5bf 试卷页面 2017-09-26 10:06:57 +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 41ec6a4838 在线课堂缩小后内容显示换行了，tpm设置板块样式问题 2017-09-22 16:40:58 +08:00
caishi 679b5a559d 增加多个选择题tab样式问题 2017-09-22 16:31:22 +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 df60c289ad 选择题选项换行、开始实战的加载层 2017-09-19 17:15:50 +08:00
daiao 055a254811 测试集样式修改 2017-09-17 11:24:57 +08:00
daiao 39064be34b 刷新测试集提示样式修改 2017-09-17 11:08:03 +08:00
miss ac2af05d28 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-15 18:13:14 +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 14209be057 添加学生弹框样式问题，实训tpm版本库页面。模块之间需要有距离，ta的主页样式问题，我的资料页去除灰色背景并调整间距，成长中心的表格样式修正 
我的主页和各个功能首页的左侧功能条，部分点击事项更改为直接刷新显示
个人主页的问题反馈，点击进入超级管理员的留言页面（）
我的题库和公共题库页尾显示的内容，请保持区域内上下居中
实训和课堂搜索后，无数据时的内容区域与文字要有间距
实训的配置页面不需要重复显示版本库
个人主页、我的课堂和我的实训的新建、加入按钮样式与各首页保持一致
我的留言、给TA留言和私信的页面需要去掉背景灰色和加边框阴影
在线课堂首页的搜索tip需要更换新样式，课堂名称显示全的话不显示tip，带有省略号的话需要有tip
 2017-09-14 09:09:12 +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 afba918c6c 搜索框的调整 2017-09-07 16:31:55 +08:00
miss df50ca52f0 样式冲突的调整 2017-09-06 18:15:09 +08:00
miss 67ecc89ce6 实训配置页面的tab样式需要更换成与实训TPI编辑页面tab一致，新建实训、新建实训路径、编辑实训路径需要加上阴影，Step2实训TPM的页面内容边框和阴影 2017-09-06 17:35:38 +08:00
miss 0b3f855c01 issue列表的修改 2017-09-05 17:04:52 +08:00
caishi 9c175ad75e 选项删除 2017-09-05 15:30:53 +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
daiao 8df37acb72 TPI测试集空格样式调整 2017-09-04 09:11:06 +08:00
daiao d58c776514 TPI预计输出与实际输出空格样式调整 2017-09-03 16:40:32 +08:00
caishi 674b11b725 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-01 17:23:58 +08:00
caishi 7f655465e3 Issues 2017-09-01 17:23:26 +08:00
miss 89078e6ff9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	app/views/games/_code_actions.html.erb
#	public/javascripts/edu/edu_tpi.js
 2017-09-01 15:11:02 +08:00
miss 63fab43103 issue列表的完成 2017-09-01 14:59:35 +08:00
caishi db646e85f0 三个主题页面的间距调整 2017-09-01 11:21:51 +08:00
caishi 65878938fc 实训路径样式修改 2017-09-01 11:17:02 +08:00
caishi 0b62727dee 三个主题页面间距调整 2017-08-31 15:20:09 +08:00
caishi abb4dd7214 单个关卡支持多个选择题的相关页面和处理变更 2017-08-31 09:00:24 +08:00
caishi 055636c8b3 技能标签 2017-08-28 16:56:31 +08:00
caishi 1769dc856c "已保存"tip 2017-08-28 11:15:33 +08:00
caishi 8cb233fbdb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/subjects/show.html.erb
 2017-08-28 09:09:43 +08:00
caishi 0f3c884f0a 课程实训点击事件 2017-08-25 21:38:07 +08:00
cxt a944456e57 Merge branch 'dev_cxt' into develop 
Conflicts:
	app/views/subjects/_subject_list.html.erb
 2017-08-25 16:13:46 +08:00
caishi ca59d5c7e1 三个主模块顶部颜色恢复成以前的渐变色 2017-08-25 14:59:17 +08:00
caishi d854c7aa5b 实训课程页面修改 2017-08-25 14:35:37 +08:00
caishi 3c0b9c49cb Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-08-25 10:37:54 +08:00
caishi 2a9e8a0969 主页面颜色渐变 2017-08-25 10:36:41 +08:00
miss a3923f1ade 缺省的测试区域不正常的问题的解决 2017-08-23 17:36:51 +08:00
miss 404098149e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
# Conflicts:
#	app/views/games/_repository.html.erb
 2017-08-23 15:20:51 +08:00