 daiao
|
d3d3dc0c5c
|
实训任务（光哥）
|
2017-03-19 17:47:14 +08:00 |
|
daiao
|
a2b20f485e
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-19 15:39:24 +08:00 |
|
daiao
|
a11d527bf9
|
控制底部导航的位置
|
2017-03-19 15:39:09 +08:00 |
 huang
|
dd9b7e95ca
|
mirror 编辑器
|
2017-03-19 15:38:48 +08:00 |
|
huang
|
a5d6ca7cad
|
ajax相关路由
|
2017-03-19 14:44:58 +08:00 |
|
huang
|
662d90b431
|
ajax轮询
|
2017-03-19 14:34:20 +08:00 |
|
huang
|
e34b8ad4ab
|
test
|
2017-03-19 14:09:16 +08:00 |
|
huang
|
51098f3482
|
新增参数output input
|
2017-03-19 12:50:50 +08:00 |
|
huang
|
4e6a534371
|
下一关功能
|
2017-03-17 17:47:04 +08:00 |
|
huang
|
7771f48eaf
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
app/views/shixuns/_settings_challenges_action_tip.html.erb
|
2017-03-17 17:16:56 +08:00 |
|
huang
|
57f74bb56c
|
自动化构建game
|
2017-03-17 17:16:10 +08:00 |
|
daiao
|
a72defba5e
|
实训配置页面
|
2017-03-17 16:12:29 +08:00 |
|
daiao
|
5cde12c454
|
实训tpm详情页面
|
2017-03-17 15:55:16 +08:00 |
|
daiao
|
612ebf875c
|
实训编辑模式
|
2017-03-17 14:42:33 +08:00 |
|
daiao
|
cb683878dd
|
实训tpm的新建tag
|
2017-03-17 13:49:57 +08:00 |
|
daiao
|
28aeff673b
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-17 13:40:24 +08:00 |
|
daiao
|
152da0ea37
|
实训新建任务添加标签
|
2017-03-17 13:40:03 +08:00 |
|
huang
|
0263165c2b
|
game中任务任务自动功能
ajax局部实现show and index
|
2017-03-17 12:42:58 +08:00 |
|
huang
|
d7fb60c801
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-16 17:32:38 +08:00 |
|
huang
|
d021dbb522
|
编辑 上移 下移动功能
|
2017-03-16 17:32:20 +08:00 |
|
daiao
|
40d101119e
|
实训全部任务页面
|
2017-03-16 17:30:52 +08:00 |
|
daiao
|
59d153d131
|
实训tpi
|
2017-03-16 17:07:23 +08:00 |
|
daiao
|
1c00afe368
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-16 17:04:12 +08:00 |
|
daiao
|
c2c8852142
|
tpi左侧导航点tab样式添加
|
2017-03-16 17:03:44 +08:00 |
|
huang
|
59608d5f1d
|
challenge创建
|
2017-03-16 16:59:53 +08:00 |
|
daiao
|
4d0ae4cc22
|
实训tpi提示
|
2017-03-16 16:01:37 +08:00 |
|
daiao
|
110b143de0
|
实训tpi暂离离开
|
2017-03-16 15:56:50 +08:00 |
|
daiao
|
e12ce9f090
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
app/views/games/show.html.erb
app/views/layouts/base_myshixun.html.erb
|
2017-03-16 14:49:50 +08:00 |
|
daiao
|
a83f8351b2
|
实训tpi页面调整
|
2017-03-16 14:46:11 +08:00 |
|
huang
|
a6d8f6834a
|
top公共部分封装
|
2017-03-16 14:44:57 +08:00 |
|
huang
|
3e870f115b
|
css加载顺序 路由链接
|
2017-03-16 14:40:55 +08:00 |
|
huang
|
471f37b3d4
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-16 14:21:00 +08:00 |
|
huang
|
45911e770e
|
定义当前任务
|
2017-03-16 14:20:41 +08:00 |
|
daiao
|
ce2482a38e
|
实训新建页面
|
2017-03-16 14:14:39 +08:00 |
|
huang
|
b87f095556
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-16 11:23:07 +08:00 |
|
huang
|
81c135c9dd
|
测试结果
|
2017-03-16 11:22:48 +08:00 |
|
daiao
|
d0a7befebf
|
实训任务新建
|
2017-03-16 11:22:20 +08:00 |
|
huang
|
8527fc857e
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-16 10:26:22 +08:00 |
|
huang
|
61db8041a4
|
输出结果关联
|
2017-03-16 10:26:02 +08:00 |
|
daiao
|
9ab969959c
|
实训项目
|
2017-03-16 10:07:49 +08:00 |
|
daiao
|
31426a3213
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-16 09:27:49 +08:00 |
|
daiao
|
cb8349176c
|
实训项目新建页面的测试集设置
|
2017-03-16 09:25:47 +08:00 |
|
huang
|
6f49950caa
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-15 17:58:22 +08:00 |
|
huang
|
28cf382576
|
output局部刷新
权限显示控制
|
2017-03-15 17:57:10 +08:00 |
|
daiao
|
d2bb822d84
|
新建阶段样例设置-添加样式输入与输出
|
2017-03-15 17:19:26 +08:00 |
|
huang
|
91e043cc16
|
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-15 17:16:39 +08:00 |
|
huang
|
c7cf576aae
|
games下一关方法封装，部分模块封装
|
2017-03-15 17:15:41 +08:00 |
|
daiao
|
8f2a040fee
|
实训配置界面
|
2017-03-15 15:15:55 +08:00 |
|
daiao
|
9db0698808
|
实训项目配置界面
|
2017-03-15 09:40:07 +08:00 |
|
daiao
|
4fd2f2d671
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-15 09:03:11 +08:00 |