 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
|
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
|
e8e1a899fe
|
current_task
|
2017-03-24 10:42:51 +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
|
fdf71d33b3
|
message存入数据库
|
2017-03-24 10:22:03 +08:00 |
|
huang
|
2326e25dba
|
开启实训前的一些提示
|
2017-03-24 10:15:49 +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
|
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
|
1eb0cf06e5
|
实训版本库公开
|
2017-03-23 16:44:14 +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
|
62fe591438
|
回调修改
|
2017-03-22 16:30:47 +08:00 |
|
huang
|
aebdd278a5
|
下一关修复
|
2017-03-22 16:21:57 +08:00 |
|
huang
|
ba7e603bb0
|
课程base样式
|
2017-03-22 16:01:20 +08:00 |
|
huang
|
9bca636f04
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-22 15:48:21 +08:00 |
|
huang
|
5a8f4be6e5
|
新建及编辑改进
|
2017-03-22 15:48:06 +08:00 |
|
daiao
|
6b3d266e57
|
实训任务
|
2017-03-22 15:46:19 +08:00 |
|
huang
|
ac0f3f7358
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-22 15:11:23 +08:00 |
|
huang
|
71f6bbf2c4
|
destroy
|
2017-03-22 15:11:11 +08:00 |
|
daiao
|
f8626db263
|
实训任务
|
2017-03-22 15:07:14 +08:00 |