Commit Graph

3278 Commits

Author SHA1 Message Date
XuCheng642 fbfa68f843 实训列表页 2017-10-13 20:20:32 +08:00
XuCheng642 8017a1e4d9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 18:50:39 +08:00
XuCheng642 efac20f6a6 单位搜索剔除当前 2017-10-13 18:49:10 +08:00
miss 39bbbc882a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 18:46:38 +08:00
daiao 026d2dbfc3 解码还原 2017-10-13 18:39:55 +08:00
daiao ce095feff9 解码格式 2017-10-13 17:26:08 +08:00
daiao 7b51a8ff25 安全转换URL 2017-10-13 17:24:53 +08:00
daiao baaa5d4add 测试集将空格匹配成+ 2017-10-13 17:05:57 +08:00
daiao 56281e41e4 解码测试集的实际输出 2017-10-13 16:55:47 +08:00
daiao 68c7d9769a 字符编码将空格 匹配成 + 2017-10-13 16:48:06 +08:00
daiao aee32c105f 增加日志 2017-10-13 16:28:42 +08:00
daiao c001844fef 增加日志 2017-10-13 16:24:34 +08:00
daiao 4d087f8b5f 测试实际输出转码 2017-10-13 16:20:54 +08:00
daiao 0a354770d0 中间层代码测试 2017-10-13 16:04:40 +08:00
daiao b7df6d9109 PHP/web实训功能 2017-10-13 14:27:03 +08:00
daiao d4dfa38bd9 PHP/Web实训功能 2017-10-13 14:16:14 +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
huang bdb80aba12 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-12 21:55:06 +08:00
huang ea860db299 实训搜索添加PHP类型 2017-10-12 21:54:56 +08:00
daiao 7885f297e4 实训审批列表为空 2017-10-12 19:56:43 +08:00
caishi fe547ad572 fork实训已发布和不能访问的显示 2017-10-12 19:50:59 +08:00
caishi 184a86f03e Merge branch 'dev_cs' into develop 2017-10-12 19:33:54 +08:00
caishi 2455f2eb44 技能标签提示框去掉关闭icon 2017-10-12 19:32:52 +08:00
cxt abf3f953e0 作业列表的序号 2017-10-12 18:51:47 +08:00
daiao 263670b7d2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-12 18:12:06 +08:00
daiao ccb43b3063 实训去除流控 2017-10-12 18:11:52 +08:00
cxt 71dafc8dd4 代码样式 2017-10-12 18:07:54 +08:00
huang 1e10cb8bad pingce 2017-10-12 18:04:03 +08:00
huang f404adcf70 评测去掉waiting time 2017-10-12 17:57:35 +08:00
cxt c97ebf5a2d 试卷预览页面去掉textarea框 2017-10-12 17:43:11 +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
caishi 0e1dea9ade 资源动态标题颜色333 2017-10-12 17:33:28 +08:00
caishi b962a87d7e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-12 17:27:00 +08:00
caishi 908e131548 回复评论右侧对齐 2017-10-12 17:26:12 +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
caishi 6d434de277 选择排序方式后的颜色 2017-10-12 17:02:06 +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
cxt c4ed5921a6 试卷详情页面样式修改,整体与作业保持一致 2017-10-12 16:22:47 +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
caishi 45262f05f9 Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 2017-10-12 11:24:31 +08:00
caishi 90cc507bcb 新建作业下拉菜单 2017-10-12 11:24:10 +08:00
daiao 9df7340f13 新增实训fork的列表页面 2017-10-12 11:18:27 +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