wangtao
/
trustieplus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,875 Commits 7 Branches 0 Tags 0 B
Commit Graph

1070 Commits

Author SHA1 Message Date
XuCheng642 6b8956e9ef 其他用户头像去除点击事件 课程搜索 2017-10-13 23:28:34 +08:00
cxt 3f027ea05c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/views/games/_game_show.html.erb
 2017-10-13 18:57:16 +08:00
daiao 9a798f3944 Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/praise_tread/_edu_praise.html.erb
	app/views/users/show.html.erb
 2017-10-13 18:53:32 +08:00
cxt b3fbfb2197 Merge branch 'dev_cs' into develop 2017-10-13 18:48:41 +08:00
cxt dc88bad0fa Merge branch 'dev_cxt' into develop 2017-10-13 18:47:48 +08:00
miss 37ef75c4c9 全部实训首页的排版错乱问题 2017-10-13 18:46:06 +08:00
cxt 2b7615c877 试卷题目ke编辑器上传图片，给出图片格式的提示框位置没有居中，且样式不是公用样式 2017-10-13 17:33:45 +08:00
caishi 5f928d4188 公共题库认证提示 2017-10-13 14:39:48 +08:00
cxt 2b6455afef Merge branch 'dev_cs' into dev_cxt 2017-10-13 10:44:32 +08:00
caishi 3039110297 发送、确定、评测等按钮改为橙色背景 2017-10-13 10:43:06 +08:00
caishi 3d503336e0 橙色按钮 2017-10-13 10:15:43 +08:00
miss d7cbe6e5ce Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 09:58:27 +08:00
miss 4c42d42cf2 分班样式的调整以及资源删除的样式调整 2017-10-13 09:57:47 +08:00
cxt b77f8fc2a2 教师评阅与试卷预览的选项顺序不一致 、 
教师评阅试卷主观题时，不拖动评分条直接在评分框中输入分数，会直接显示-1
 2017-10-13 09:45:33 +08:00
cxt c7dc2a7878 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-12 17:34:30 +08:00
cxt f9f1e25965 试卷相关 2017-10-12 17:34:14 +08:00
XuCheng642 797aac75b5 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-12 17:04:29 +08:00
caishi 3ca3181ad2 Merge branch 'dev_cs' into develop 2017-10-12 17:03:24 +08:00
XuCheng642 ee9dc6c6aa Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 
Conflicts:
	app/controllers/managements_controller.rb
	app/views/users/show.html.erb
 2017-10-12 17:01:44 +08:00
XuCheng642 c72c4d2076 单位修改 2017-10-12 16:53:00 +08:00
miss 8bd27d4f3d 匿评申诉的样式问题 2017-10-12 16:17:06 +08:00
caishi d1b1d6317d 新建课堂的课程名称增加tip 2017-10-12 16:06:45 +08:00
cxt b8a958ddbb Merge branch 'dev_cs' into dev_cxt 
Conflicts:
	app/views/exercise/_new_question.html.erb
 2017-10-12 15:29:11 +08:00
cxt b0b47b5443 试卷的题干换成ke 2017-10-12 15:26:39 +08:00
cxt cd64199151 Merge branch 'develop' into dev_cxt 
Conflicts:
	app/views/exercise/_edit_MC.html.erb
 2017-10-12 11:14:11 +08:00
cxt 86a6232795 题干换成ke 支持贴图 2017-10-12 11:12:43 +08:00
caishi 349b259c0e Merge branch 'develop' into dev_cs 2017-10-12 09:22:39 +08:00
caishi f9a36285fe 新建试卷时调整题目顺序，点击上下移动后tip不消失 2017-10-12 09:21:19 +08:00
caishi cdf58a2709 实训作业和普通作业未提交tip 2017-10-11 14:55:34 +08:00
caishi 594a0a1d4a Fork 2017-10-11 09:59:20 +08:00
cxt 6dc66e269e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-10 16:52:40 +08:00
daiao 268a626e7a 实训路径的ke简介和ke学习须知，都改为md 2017-10-10 16:45:41 +08:00
caishi c94e1ff079 作业说明外加Issues 2017-10-10 14:50:29 +08:00
daiao bbfb1f72e4 Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao 2017-10-09 17:31:00 +08:00
daiao 6eeaf998f4 html实训，点击评测后，还是一片白 2017-10-09 17:30:35 +08:00
caishi ce33efba30 TPI评论 2017-10-09 17:23:17 +08:00
cxt 9739f2bdae 基本资料保存时，同单位同学号不能保存 2017-10-09 16:22:55 +08:00
XuCheng642 ef6c3a443a 回复和点赞样式修改 2017-10-09 15:16:34 +08:00
caishi 41ee4b838d 留言页面的所有头像应该为圆形 
平台弹框只有一个选择按钮时去掉弹框右上角的叉叉键
 2017-10-09 14:15:03 +08:00
daiao 49ffc348e2 Merge branch 'dev_daiao' into develop 
Conflicts:
	app/views/games/_shixun_comment_list.html.erb
 2017-09-30 21:40:23 +08:00
miss abf89afc37 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:17:31 +08:00
huang 2dd285f6e7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:06:25 +08:00
huang c6c9507abe 文件目录添加根目录 2017-09-30 20:41:05 +08:00
daiao e00bb90c23 Merge branch 'develop' into dev_daiao 
Conflicts:
	app/views/games/_shixun_comment_list.html.erb
	app/views/layouts/_logined_header.html.erb
 2017-09-30 19:51:30 +08:00
caishi 1cdecbb312 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 19:42:39 +08:00
caishi 274095eed2 合作者 2017-09-30 19:41:06 +08:00
daiao a5289610a3 实训TPI的回复 2017-09-30 19:23:38 +08:00
caishi c0f1c278d7 Merge branch 'dev_cs' into develop 2017-09-30 18:39:27 +08:00
caishi c7ac2bdb41 Merge branch 'dev_cxt' into dev_cs 
Conflicts:
	app/views/messages/_course_show.html.erb
	app/views/student_work/index.html.erb
 2017-09-30 18:27:00 +08:00
miss 61a75ca0d7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 16:57:21 +08:00