Commit Graph

278 Commits

Author SHA1 Message Date
forge01 1ba3d74364 修复代码重置失败的问题 2017-10-17 16:54:24 +08:00
huang 13e14770ed 实训平台的一些优化 2017-10-17 09:55:34 +08:00
huang b80898cf6b 更新实训关联课程也更新 2017-10-17 09:34:01 +08:00
huang 31bc0e166d 实训发布更新后删除已发布的实训 2017-10-17 09:32:47 +08:00
huang 1ec97a1ec5 实训identifier自动生成12位随机数 2017-10-17 09:31:19 +08:00
huang d25df3770b 初始化数据 2017-10-17 09:30:04 +08:00
huang 58f492d341 实训开启各种情况处理 2017-10-17 09:20:13 +08:00
huang d3858bb30b 打开文件的收为空处理 2017-10-17 09:17:21 +08:00
huang dcd02eaf7c 评测的时候去掉tpi信息 2017-10-17 09:15:13 +08:00
huang f624cae813 gitlab hook触发机制 2017-10-17 09:10:48 +08:00
huang 91562bf482 获取版本库树形结构 2017-10-17 09:08:45 +08:00
huang eb457f4774 add migrate 2017-10-14 15:25:07 +08:00
daiao 7c804a6f77 PHTWeb实训 2017-10-13 22:52:13 +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 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 c1efa07788 实训TPM增加评论功能 2017-10-10 15:11:53 +08:00
cxt 13d4ddb76d 实训申请发布的时候增加“技能标签”的判断 2017-10-10 10:20:53 +08:00
huang 028d5e087c 实训后台删除一并删除gitlab版本库 2017-10-09 15:59:39 +08:00
huang 75a279952d 实训复制去掉复制合作者的功能 2017-10-09 15:16:26 +08:00
daiao 73adf1844f TPI评论使用新版样式 2017-10-09 14:13:59 +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
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
huang a3c8e28c52 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-30 21:40:12 +08:00
huang a9c5a42594 实训修改代码不重置 2017-09-30 21:37:43 +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
huang b2304597b4 实训路径文件目录选择 2017-09-30 19:25:35 +08:00
daiao a5289610a3 实训TPI的回复 2017-09-30 19:23:38 +08:00
huang 47439cb94d Merge branch 'develop' into dev_huang
Conflicts:
	app/controllers/shixuns_controller.rb
2017-09-30 18:43:16 +08:00
huang e38cee66b8 文件目录 2017-09-30 18:12:25 +08:00
huang 2ee93c73f6 Merge branch 'dev_new_gitlab_huang' into develop 2017-09-30 16:48:40 +08:00
huang 90ade97d88 开启挑战的时候将educoder加入到myshixun中 2017-09-30 16:38:38 +08:00
miss 5afcbb72c6 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
#	app/controllers/shixuns_controller.rb
#	public/stylesheets/css/edu-public.css
2017-09-30 16:18:36 +08:00
huang cba5c75ba0 Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang 2017-09-30 15:37:01 +08:00
huang b54362162c Merge branch 'develop' into dev_huang 2017-09-30 15:36:48 +08:00
miss c8262cfeaa 文件路径的弹框 2017-09-30 15:32:27 +08:00
miss 88b5a20c47 分页个数 2017-09-30 10:50:12 +08:00
miss adb0aa3f66 文件路径弹框 2017-09-30 10:48:43 +08:00
huang 3c19e12081 实训版本库代码同步功能 2017-09-30 10:42:26 +08:00
miss 12cebcb252 学员统计板块的金币值模块以及其它问题的修改。tip样式的增加与修改 2017-09-29 21:10:56 +08:00
miss dfe5fe828e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-29 11:11:01 +08:00
huang e46c4a57e3 发布了修改版本也会触发事件 2017-09-28 16:20:05 +08:00
miss 3602ecfad2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-09-28 16:11:02 +08:00
miss e070769613 tip调整 2017-09-28 16:10:26 +08:00
huang fad2fb478f 实训复制失败添加日志区分 2017-09-28 14:12:42 +08:00
huang 3ce5368a9a 老师角色 2017-09-28 11:29:05 +08:00
huang 76cd81ec8e 复制权限修改 2017-09-28 11:11:15 +08:00