 huang
|
0dbe68e6ee
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-22 13:45:27 +08:00 |
|
huang
|
4d23032937
|
实训详情
|
2017-03-22 13:45:01 +08:00 |
 daiao
|
20bbfe7d4e
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-22 10:53:44 +08:00 |
|
daiao
|
6b20855439
|
实训任务
|
2017-03-22 10:53:27 +08:00 |
|
huang
|
9f0128a878
|
shixun新建和编辑同步
|
2017-03-22 10:30:20 +08:00 |
|
huang
|
66fc9b858e
|
路由参数
|
2017-03-21 20:48:47 +08:00 |
|
huang
|
deb6cf4bee
|
run 调试
|
2017-03-21 20:32:16 +08:00 |
|
huang
|
631acd2d79
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-21 20:07:45 +08:00 |
|
huang
|
76a630c6be
|
公共方法的封装
|
2017-03-21 20:06:39 +08:00 |
|
daiao
|
da131b7a0a
|
实训任务
|
2017-03-21 20:00:29 +08:00 |
|
huang
|
e098f7abf6
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-21 17:53:53 +08:00 |
|
huang
|
d68569d3ab
|
局部刷新的一些问题
|
2017-03-21 17:53:35 +08:00 |
|
daiao
|
97894811a0
|
实训任务
|
2017-03-21 17:37:18 +08:00 |
|
daiao
|
905dca7758
|
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 17:07:26 +08:00 |
|
daiao
|
a3f0cc9b51
|
实训
|
2017-03-21 17:06:24 +08:00 |
|
huang
|
5a1284e42d
|
ajax获取结果
|
2017-03-21 17:06:17 +08:00 |
|
daiao
|
50f5c4a735
|
实训
|
2017-03-21 15:20:03 +08:00 |
|
daiao
|
cb31eecb07
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-21 15:10:28 +08:00 |
|
daiao
|
2b7c6de55c
|
实训任务
|
2017-03-21 15:10:13 +08:00 |
|
huang
|
78c46065f8
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-21 15:02:53 +08:00 |
|
huang
|
e95c686ea1
|
实训编辑功能完善
|
2017-03-21 15:02:36 +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 |
 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 |
|
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 |
|
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 |
|
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
|
d562864835
|
搜索报500
|
2017-03-16 10:15:31 +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 |
|
cxt
|
c4d9f3c67c
|
Merge branch 'develop' into dev_bigdata
Conflicts:
app/controllers/account_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/_logined_header.html.erb
app/views/layouts/base_contest_community.html.erb
app/views/layouts/base_contests.html.erb
app/views/layouts/base_course_community.html.erb
app/views/layouts/base_courses.html.erb
app/views/layouts/base_project_community.html.erb
app/views/layouts/base_syllabus.html.erb
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/layouts/new_base_user_show.html.erb
public/stylesheets/css/structure.css
|
2017-03-15 15:28:56 +08:00 |
|
daiao
|
8f2a040fee
|
实训配置界面
|
2017-03-15 15:15:55 +08:00 |
|
cxt
|
fcae5e9690
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-03-15 14:55:11 +08:00 |
|
cxt
|
0ed7f92cc5
|
班级删除学生不成功
|
2017-03-15 14:54:39 +08:00 |
|
cxt
|
3b4b069348
|
头像上传代码还原
|
2017-03-15 14:47:54 +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 |
|
daiao
|
98c18a874c
|
开始挑战的弹框
|
2017-03-15 09:02:59 +08:00 |
|
huang
|
19456503da
|
next方法封装
|
2017-03-14 18:11:26 +08:00 |
|
huang
|
c920582fff
|
开启实训权限
|
2017-03-14 17:37:56 +08:00 |
|
daiao
|
d10ac9b7fe
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-14 17:25:14 +08:00 |
|
daiao
|
8886949dc9
|
实训
|
2017-03-14 17:25:06 +08:00 |
|
huang
|
c09f8c0afe
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-14 17:10:56 +08:00 |
|
huang
|
df1b1484f8
|
新建相关关联
|
2017-03-14 17:10:32 +08:00 |
|
cxt
|
a1509088e4
|
头像获取延迟一秒
|
2017-03-14 16:51:55 +08:00 |
|
cxt
|
2d38af7c3d
|
头像上传加打印输出
|
2017-03-14 16:42:08 +08:00 |
|
cxt
|
9468257c0c
|
头像上传
|
2017-03-14 16:30:04 +08:00 |
|
daiao
|
f46178b37a
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
app/views/challenges/index.html.erb
|
2017-03-14 16:00:59 +08:00 |
|
daiao
|
c20d13e46b
|
实训任务，index页面
|
2017-03-14 15:59:50 +08:00 |
|
cxt
|
2520058a5d
|
组织子域名申请流程问题
|
2017-03-14 15:17:46 +08:00 |
|
huang
|
a894e6c932
|
实训base权限控制
|
2017-03-14 15:14:03 +08:00 |
|
huang
|
6d55409a85
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-14 14:56:33 +08:00 |
|
huang
|
5992bcc128
|
版本库文件局部刷新
|
2017-03-14 14:56:08 +08:00 |
|
daiao
|
fe021e04c2
|
实训tpm，新建实训页面
|
2017-03-14 14:52:37 +08:00 |
|
daiao
|
fc673fb704
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
public/stylesheets/css/taskstyle.css
|
2017-03-14 14:41:50 +08:00 |
|
daiao
|
0b82b3e994
|
TPM实训index页面
|
2017-03-14 14:39:05 +08:00 |
|
huang
|
f086f5acd3
|
版本库封装
|
2017-03-14 14:38:14 +08:00 |
|
cxt
|
4e2f82a187
|
分组作业和团队竞赛在提交或修改作品时，选择“合作成员“的弹框中无法选择的成员提示不够明显
|
2017-03-14 14:35:14 +08:00 |
|
huang
|
38ff90a8bf
|
myshixun模板
|
2017-03-14 11:25:01 +08:00 |
|
daiao
|
30a33b967f
|
问吧点击综合排序无效
|
2017-03-14 10:57:16 +08:00 |
|
huang
|
e3285eecc9
|
output 输出
|
2017-03-14 10:48:46 +08:00 |
|
huang
|
c069279105
|
myshixuns 版本库entry
|
2017-03-14 10:08:49 +08:00 |
|
cxt
|
e1c8fccf00
|
发布了竞赛题和发布了作业的消息链接改为跳转到作品列表（基于项目的分组作业不应该直接跳转到新建页面）
|
2017-03-14 09:35:56 +08:00 |
|
huang
|
6ec7769c0e
|
Merge branch 'dev_bigdata' into dev_shixun_project
Conflicts:
app/controllers/account_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/_logined_header.html.erb
app/views/layouts/base_contest_community.html.erb
app/views/layouts/base_contests.html.erb
app/views/layouts/base_course_community.html.erb
app/views/layouts/base_courses.html.erb
app/views/layouts/base_project_community.html.erb
app/views/layouts/base_syllabus.html.erb
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/layouts/new_base_user_show.html.erb
public/stylesheets/css/structure.css
|
2017-03-14 09:30:02 +08:00 |
|
huang
|
63881869f6
|
game局部显示版本库路由及相关action
|
2017-03-13 17:39:27 +08:00 |
|
daiao
|
8866b91c8f
|
项目主页动态列表中@功能不正常（课程应该也好了）
|
2017-03-13 17:25:36 +08:00 |
|
cxt
|
931022c7b1
|
团队竞赛补交作品
|
2017-03-13 17:18:36 +08:00 |
|
cxt
|
bb5522332c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-03-13 16:59:03 +08:00 |
|
陈晓婷
|
7a3e1a6a75
|
Merge branch 'develop' into 'develop'
竞赛相关
See merge request !174
|
2017-03-13 16:58:52 +08:00 |
|
cxt
|
54a4a189be
|
作品附件打包下载调整到500M
|
2017-03-13 16:57:46 +08:00 |
|
daiao
|
376847689a
|
课程动态二级回复，讨论区一级/二级回复增加AT功能
|
2017-03-13 15:59:28 +08:00 |
|
daiao
|
cfcf12d7ed
|
强制修改资料页面，点击base弹出空白页问题
|
2017-03-13 15:21:46 +08:00 |
|
huang
|
8bbee334c3
|
实训开启显示权限控制
|
2017-03-13 15:18:53 +08:00 |