 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 |
 cxt
|
43331b526c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_bigdata
|
2017-03-20 09:33:50 +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 |
|
cxt
|
6cfd5d6dbd
|
头像上传调整
|
2017-03-17 17:40:26 +08:00 |
|
cxt
|
8e52e900d7
|
图片上传延迟
|
2017-03-17 17:29:37 +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 |
|
cxt
|
b87ac32bd5
|
头像上传时等待三秒（确保文件上传完成）
|
2017-03-17 16:35:23 +08:00 |
|
daiao
|
a72defba5e
|
实训配置页面
|
2017-03-17 16:12:29 +08:00 |
|
daiao
|
5cde12c454
|
实训tpm详情页面
|
2017-03-17 15:55:16 +08:00 |
|
cxt
|
dfaab07455
|
图片压缩分情况处理
|
2017-03-17 15:50:57 +08:00 |
|
daiao
|
612ebf875c
|
实训编辑模式
|
2017-03-17 14:42:33 +08:00 |
|
cxt
|
4f2779d6c0
|
样式调整
|
2017-03-17 14:33:15 +08:00 |
|
陈晓婷
|
4337a9d1fd
|
Merge branch 'develop' into 'develop'
本周上线任务
See merge request !176
|
2017-03-17 14:32:20 +08:00 |
|
cxt
|
357b7c5aa0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-03-17 14:30:44 +08:00 |
|
陈晓婷
|
676ef6e176
|
Merge branch 'develop' into 'develop'
周一修改的内容
See merge request !175
|
2017-03-17 14:30:26 +08:00 |
|
cxt
|
f520d641ab
|
更新设置了延期发布的班级资源时，延期发布设置会丢失，且没有提醒
|
2017-03-17 13:55:21 +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 |
|
cxt
|
b6996da6db
|
给超级管理员增加删除课程的权限
|
2017-03-17 09:43:46 +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 |