 daiao
|
2b7c6de55c
|
实训任务
|
2017-03-21 15:10:13 +08:00 |
|
daiao
|
a9ccb3b7b9
|
实训任务
|
2017-03-21 14:15:01 +08:00 |
 huang
|
8655e91d48
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-21 14:06:14 +08:00 |
|
huang
|
3ae5605e4e
|
版本库放大所辖
|
2017-03-21 14:06:04 +08:00 |
|
daiao
|
2b4e61c2bc
|
实训任务
|
2017-03-21 14:05:02 +08:00 |
|
daiao
|
6a9684937e
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-21 12:38:21 +08:00 |
|
daiao
|
d7d47629ce
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
app/views/games/_tree.html.erb
|
2017-03-21 12:38:04 +08:00 |
|
huang
|
63d12a7b36
|
版本库border
|
2017-03-21 12:36:20 +08:00 |
|
daiao
|
966ec377a4
|
实训任务
|
2017-03-21 12:35:55 +08:00 |
|
huang
|
afd73aca64
|
版本库样式调整
|
2017-03-21 10:33:52 +08:00 |
|
huang
|
f5ba99393e
|
版本库样式冲突
|
2017-03-21 10:28:56 +08:00 |
|
huang
|
cd30987c88
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-21 10:06:21 +08:00 |
|
huang
|
62ba2e723c
|
版本库样式调整
|
2017-03-21 10:06:06 +08:00 |
|
daiao
|
5629b26378
|
实训任务
|
2017-03-21 09:58:46 +08:00 |
|
daiao
|
c77fe5f2dd
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-21 09:17:56 +08:00 |
|
daiao
|
bc0c995a0c
|
实训tpi
|
2017-03-21 09:17:35 +08:00 |
|
huang
|
7044ce8f1a
|
编辑的时候去掉行头字符
|
2017-03-21 09:03:19 +08:00 |
|
huang
|
37679021ea
|
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-21 08:57:02 +08:00 |
|
huang
|
56da0352b1
|
版本库添加编辑功能
|
2017-03-21 08:56:00 +08:00 |
|
daiao
|
6f4e4bea4c
|
实训tpi放大缩小效果
|
2017-03-20 20:04:50 +08:00 |
|
daiao
|
1d22b7e2b9
|
实训界面扩大缩小功能
|
2017-03-20 17:14:05 +08:00 |
|
daiao
|
5e7dd60194
|
控制tpi的当前任务
|
2017-03-20 15:50:04 +08:00 |
|
daiao
|
b054510fb7
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-20 15:42:19 +08:00 |
|
daiao
|
8708fa4afc
|
实训任务
|
2017-03-20 15:41:56 +08:00 |
|
huang
|
0d4928da24
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-20 14:51:28 +08:00 |
|
huang
|
48913a3c8c
|
公共方法封装
|
2017-03-20 14:51:07 +08:00 |
|
daiao
|
b1b1cddd95
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-20 14:35:56 +08:00 |
|
daiao
|
69e116806e
|
实训任务
|
2017-03-20 14:35:40 +08:00 |
|
huang
|
072c9550fc
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
app/controllers/games_controller.rb
|
2017-03-20 11:26:28 +08:00 |
|
huang
|
563febc7c4
|
完成上线关
|
2017-03-20 11:25:15 +08:00 |
|
daiao
|
8d55cb13c7
|
实训
|
2017-03-20 10:51:00 +08:00 |
|
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 |