Commit Graph

5789 Commits

Author SHA1 Message Date
huang ceca904217 game修改 2017-03-29 15:27:00 +08:00
huang bfdb109b64 game index 2017-03-29 15:04:24 +08:00
huang 287de92129 修改game结构,从challenge中获取公共属性 2017-03-29 14:51:57 +08:00
huang b59f39754b 开启实训事务一致性处理 2017-03-29 14:25:54 +08:00
huang 54e4ec526d 实训ceshi 2017-03-29 09:14:41 +08:00
huang a175c4ad37 shixun结构修改 2017-03-28 17:15:45 +08:00
huang 4fc3c823b7 实训model整理 2017-03-28 15:17:41 +08:00
huang 3719b8c973 实训入口 2017-03-28 14:39:07 +08:00
huang 598e00f5c6 去掉日志打印 2017-03-27 15:15:07 +08:00
huang 58c2c7640a 添加一些打印的日志 2017-03-27 15:02:12 +08:00
huang e90a5d0a1a 0 2017-03-26 13:28:23 +08:00
huang 3bee690554 日志打印 2017-03-26 13:26:13 +08:00
huang 1f36ec2636 添加日志打印 2017-03-26 11:39:09 +08:00
huang ba68647c1b 不能编辑的问题 2017-03-24 22:50:22 +08:00
huang 020eb2d35a Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 20:30:00 +08:00
huang f5869e620b 修复编辑的bug 2017-03-24 20:29:30 +08:00
cxt 1f6751a80c Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 20:20:50 +08:00
cxt e464c7644e 注册邮箱账号后更换邮件地址,并没有收到激活邮件必须点击重新发送才可以收到,不合理 2017-03-24 20:20:31 +08:00
daiao e0739d5d57 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 19:51:28 +08:00
huang 8b8ad0056f 修复版本库fork问题 2017-03-24 19:49:59 +08:00
daiao fa73a3618c 实训提交评测60S超时 2017-03-24 19:49:43 +08:00
huang 8252621991 code转json格式 2017-03-24 17:38:56 +08:00
daiao f2e337fb12 fork存在的时候则不重复fork 2017-03-24 17:37:00 +08:00
huang a4be04b67a Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
	app/views/shixuns/_monitor_tip.html.erb
2017-03-24 16:53:19 +08:00
huang ac641f64c4 jenkins地址写入配置文件 2017-03-24 16:52:08 +08:00
huang 69d35b347d 开启实训的时候数据一致性 2017-03-24 16:42:58 +08:00
cxt e3150716f3 Merge branch 'dev_bigdata' into dev_shixun_project
Conflicts:
	app/views/layouts/_footer.html.erb
	app/views/layouts/base_contest_community.html.erb
	app/views/layouts/base_contests.html.erb
	app/views/layouts/base_course_community.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_project_community.html.erb
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	db/schema.rb
	public/stylesheets/css/structure.css
	public/stylesheets/font/FontAwesome.otf
	public/stylesheets/font/fontawesome-webfont.eot
	public/stylesheets/font/fontawesome-webfont.svg
	public/stylesheets/font/fontawesome-webfont.ttf
	public/stylesheets/font/fontawesome-webfont.woff
	public/stylesheets/font2/FontAwesome.otf
	public/stylesheets/font2/fontawesome-webfont.eot
	public/stylesheets/font2/fontawesome-webfont.svg
	public/stylesheets/font2/fontawesome-webfont.ttf
	public/stylesheets/font2/fontawesome-webfont.woff
	public/stylesheets/fonts/FontAwesome.otf
	public/stylesheets/fonts/fontawesome-webfont.eot
	public/stylesheets/fonts/fontawesome-webfont.svg
	public/stylesheets/fonts/fontawesome-webfont.ttf
	public/stylesheets/fonts/fontawesome-webfont.woff
2017-03-24 16:17:01 +08:00
cxt 324d14ee92 新版登录和注册 2017-03-24 16:05:52 +08:00
huang 3231f96b5f 完成首次进入展示代码功能 2017-03-24 15:31:16 +08:00
huang 001a3796c7 根目录刷新显示页面 2017-03-24 15:05:44 +08:00
huang b3141348b0 版本库默认打开设置文件 2017-03-24 14:42:10 +08:00
huang 9e5ba45b5c Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 12:34:16 +08:00
huang 8b3fae60a1 output64位编码 2017-03-24 12:33:58 +08:00
daiao aa02211971 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 12:30:29 +08:00
daiao 52d642b51b 默认分支 2017-03-24 12:30:10 +08:00
huang fbce9fb028 打印报错信息 2017-03-24 10:59:28 +08:00
huang 41ddd9b2a2 提示信息错误 2017-03-24 10:54:36 +08:00
huang fdf71d33b3 message存入数据库 2017-03-24 10:22:03 +08:00
huang 28f9915d41 下一关权限判断 2017-03-24 10:03:10 +08:00
huang a4bee495a2 下一关的一些改进 2017-03-24 10:00:06 +08:00
huang c4ffa20461 权限控制,及修改获取当前任务的方法 2017-03-24 09:45:01 +08:00
huang a4eec42b7f 已通过控制 2017-03-23 20:23:31 +08:00
huang 62ab862516 tpm权限控制
及index一些统计
2017-03-23 17:41:32 +08:00
huang 77ba9c1958 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
	app/views/games/_exec_results.html.erb
2017-03-23 15:08:34 +08:00
huang 00b3a7c4fb ajax获取数据 2017-03-23 15:07:23 +08:00
daiao a80eeeb5ab 实训任务 2017-03-23 10:56:00 +08:00
huang c8c3b6188c games一些修改 2017-03-22 18:13:50 +08:00
huang aebdd278a5 下一关修复 2017-03-22 16:21:57 +08:00
huang 5a8f4be6e5 新建及编辑改进 2017-03-22 15:48:06 +08:00
huang 71f6bbf2c4 destroy 2017-03-22 15:11:11 +08:00