Commit Graph

1252 Commits

Author SHA1 Message Date
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
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 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
daiao 7885f297e4 实训审批列表为空 2017-10-12 19:56:43 +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
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
daiao 9df7340f13 新增实训fork的列表页面 2017-10-12 11:18:27 +08:00
huang 37bb1cb749 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-12 10:51:39 +08:00
huang 5fe03a3ec6 添加实训脚本迁移;实训技术平台增加PHP、PHP/web 2017-10-12 10:51:25 +08:00
daiao 424e8b2d34 实训管理员界面重置策略更换 2017-10-11 17:35:10 +08:00
daiao bbdd86b5da 导出excel的sheet名称修改 2017-10-11 17:09:42 +08:00
daiao 52d546bc1c Merge branch 'dev_cxt' into develop 2017-10-11 16:26:50 +08:00
daiao c47403efd5 超级管理员的实训统计增加1个学生单位的统计报表 2017-10-11 16:23:45 +08:00
cxt 570258bd81 实训统计 2017-10-11 15:30:55 +08:00
cxt 3602e7be1c Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt 2017-10-11 15:18:39 +08:00
daiao 82faefdb86 超级管理员的实训统计增加1个学生单位的统计报表 2017-10-11 15:15:51 +08:00
cxt 1f1f30f3c3 课堂动态的帖子动态,在回复的时候浏览数+1 2017-10-11 11:27:26 +08:00
cxt fcd09d3808 指定自动授权单位的某些试用申请,没有自动授权 2017-10-11 10:34:42 +08:00
cxt a51f3b760d 实训统计导出的报表修正 2017-10-11 09:40:32 +08:00
cxt 6dc66e269e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-10 16:52:40 +08:00
cxt c69f9c9d9f 课程列表数据混乱,educoder创建的C++程序设计课程有多条记录 2017-10-10 15:59:52 +08:00
daiao 8313ccfbd7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-10 15:12:48 +08:00
cxt 485a10ef70 实训路径编辑问题 2017-10-10 10:38:11 +08:00
cxt 13d4ddb76d 实训申请发布的时候增加“技能标签”的判断 2017-10-10 10:20:53 +08:00
cxt 58b667a44b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-09 16:23:15 +08:00
cxt 9739f2bdae 基本资料保存时,同单位同学号不能保存 2017-10-09 16:22:55 +08:00
huang 028d5e087c 实训后台删除一并删除gitlab版本库 2017-10-09 15:59:39 +08:00
huang c4f4bc7437 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-09 15:16:50 +08:00
XuCheng642 ef6c3a443a 回复和点赞样式修改 2017-10-09 15:16:34 +08:00
huang 75a279952d 实训复制去掉复制合作者的功能 2017-10-09 15:16:26 +08:00
cxt cd6486671f 课堂的作业列表按照发布时间倒序排序 2017-10-09 14:38:54 +08:00
daiao 249c62333e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-09 11:07:40 +08:00
daiao 1215994034 实训选择题tpi页面也需要有评测信息 2017-10-09 11:07:21 +08:00
cxt aac531ca54 超级管理员的实训审批 2017-09-30 23:12:39 +08:00
huang eeca0ec059 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 22:49:17 +08:00
huang e18e10ba42 区分正式版测试版domain问题 2017-09-30 22:49:05 +08:00
daiao c728f4caa1 Merge branch 'develop' into dev_daiao 2017-09-30 22:35:10 +08:00
daiao 0878597cc4 贴吧样式冲突 2017-09-30 22:34:48 +08:00
daiao 236445e368 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 22:02:25 +08:00
daiao 880f9a7c06 还原TPI回复功能 2017-09-30 22:02:04 +08:00