Commit Graph

11883 Commits

Author SHA1 Message Date
Linda 29c93cfb95 增加路径 2017-03-24 16:07:22 +08:00
Linda 587b4b73e0 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 15:43:02 +08:00
daiao 67e74118c4 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 15:41:50 +08:00
daiao 10dc5a9668 点击开启评测 无感知 2017-03-24 15:41:33 +08:00
Linda 6c62d7be0b 头部标题样式修改
删除成功提示
2017-03-24 15:41:29 +08:00
Linda b3569d9c61 新建编辑页面,tag新增显示效果 2017-03-24 15:13:56 +08:00
huang 001a3796c7 根目录刷新显示页面 2017-03-24 15:05:44 +08:00
huang 27c34985ca Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 14:42:32 +08:00
huang b3141348b0 版本库默认打开设置文件 2017-03-24 14:42:10 +08:00
Linda 8b907ff973 配置实训KE编辑器宽度修改 2017-03-24 14:10:57 +08:00
Linda 82fdb9c867 导航选中样式修改
新建实训选中提示修改
2017-03-24 14:05:47 +08:00
daiao 93e67e5dbc Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 12:39:01 +08:00
daiao 9e6a146d43 保存按钮放回原来地方 2017-03-24 12:38:44 +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 41ddd9b2a2 提示信息错误 2017-03-24 10:54:36 +08:00
huang 0654222dee Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 10:43:41 +08:00
daiao 932240737c 谷歌浏览器不兼容关闭 2017-03-24 10:43:13 +08:00
huang b77ba2b751 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 10:38:45 +08:00
huang f8a05e72d1 为0的时候不显示 2017-03-24 10:38:30 +08:00
daiao 0dd140749c Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-24 10:28:39 +08:00
daiao 80835ab8dc 实训编辑模式样式调整 2017-03-24 10:28:20 +08:00
huang 2326e25dba 开启实训前的一些提示 2017-03-24 10:15:49 +08:00
huang 3482ececf9 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 20:24:41 +08:00
huang a4eec42b7f 已通过控制 2017-03-23 20:23:31 +08:00
daiao b20e265d8d Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 20:22:23 +08:00
daiao 44ec1d23cc TPI实训 2017-03-23 20:21:37 +08:00
daiao 840a57fb0e TPM新建阶段加入KE 2017-03-23 20:19:39 +08:00
huang c3708d723e Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 17:41:48 +08:00
huang 62ab862516 tpm权限控制
及index一些统计
2017-03-23 17:41:32 +08:00
daiao ac7959bb21 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 16:51:47 +08:00
daiao e4985ce3bd 实训任务 2017-03-23 16:51:32 +08:00
huang 63494a2487 Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project 2017-03-23 16:36:35 +08:00
huang 8006237d16 修改测试用例类型 2017-03-23 16:35:18 +08:00
daiao 4c50c708c2 实训任务 2017-03-23 15:50:27 +08:00
huang ffe1641485 完成数据结果ajax获取 2017-03-23 15:42:09 +08:00
huang d61e4753cf end问题 2017-03-23 15:10:56 +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 8e93f5758f 实训任务 2017-03-23 14:18:00 +08:00
daiao 56c7dccd56 实训 2017-03-23 14:03:09 +08:00
daiao 9bc860eb24 实训任务 2017-03-23 13:43:56 +08:00
daiao 7888cc1101 实训 2017-03-23 11:09:38 +08:00
daiao a80eeeb5ab 实训任务 2017-03-23 10:56:00 +08:00
daiao 6f00a89cfa 保存修改-宽版 2017-03-23 09:30:19 +08:00
daiao 57a6b4d322 保存修改按钮放上面 2017-03-23 09:04:02 +08:00
huang c8c3b6188c games一些修改 2017-03-22 18:13:50 +08:00
huang aebdd278a5 下一关修复 2017-03-22 16:21:57 +08:00