 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 |
|
huang
|
92d23ebb7b
|
base myshixun框架，新字体引入
|
2017-03-14 13:38:02 +08:00 |
|
huang
|
38ff90a8bf
|
myshixun模板
|
2017-03-14 11:25:01 +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 |
|
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 |
|
huang
|
8bbee334c3
|
实训开启显示权限控制
|
2017-03-13 15:18:53 +08:00 |
|
huang
|
90efe7cc35
|
tpm版本库目录功能
|
2017-03-13 14:55:18 +08:00 |
|
huang
|
47e87b115a
|
flash闪存处理
|
2017-03-13 14:37:39 +08:00 |
|
huang
|
0298c45b20
|
shixun模块版本库创建事务一致性处理
|
2017-03-13 14:12:34 +08:00 |
|
huang
|
fbc52a7892
|
games模块相关功能
|
2017-03-13 09:00:13 +08:00 |
|
huang
|
6183db782a
|
games模块开发
|
2017-03-10 15:41:44 +08:00 |
|
huang
|
5a2c7a4830
|
post请求登录过滤
|
2017-03-09 17:51:03 +08:00 |
|
huang
|
6d182eca2c
|
shixun测试
|
2017-03-09 17:03:50 +08:00 |
|
huang
|
8526c409b5
|
build输出结果记录
|
2017-03-09 14:51:39 +08:00 |
|
huang
|
fc91dce7ba
|
实训任务build
|
2017-03-08 17:16:05 +08:00 |
|
huang
|
8d6fb4d071
|
完成challenge build
|
2017-03-08 16:36:19 +08:00 |
|
huang
|
e753d0453c
|
实训开启后完成任务的自动创建
|
2017-03-08 15:37:48 +08:00 |
|
huang
|
622b7a4979
|
TPI开启任务模块
|
2017-03-08 14:59:40 +08:00 |
|
huang
|
c1a8682ac2
|
job更新功能
|
2017-03-08 09:32:08 +08:00 |
|
huang
|
6fc4e971de
|
jenkins job创建
|
2017-03-08 09:16:38 +08:00 |
|
huang
|
3742757ae6
|
shixun job create
|
2017-03-07 18:19:50 +08:00 |
|
huang
|
4b825ecd22
|
challenge列表页面
|
2017-03-07 13:43:21 +08:00 |
|
huang
|
7faee25b3f
|
url链接
|
2017-03-07 09:36:56 +08:00 |
|
huang
|
dd31a55bdd
|
Merge branch 'develop' into dev_shixun_project
Conflicts:
db/schema.rb
|
2017-03-07 09:32:40 +08:00 |
|
huang
|
065cd95714
|
删除项目后依旧能fork项目功能
|
2017-03-07 09:25:51 +08:00 |
|
huang
|
956a078a36
|
challeng模块新建、create
|
2017-03-06 17:36:01 +08:00 |
|
huang
|
ca118e2bef
|
版本库分离
|
2017-03-06 14:56:34 +08:00 |
 陈晓婷
|
ddbef73270
|
Merge branch 'develop' into 'develop'
bug修复
See merge request !163
|
2017-03-03 19:23:00 +08:00 |
|
cxt
|
a92bb253aa
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-03-03 19:21:34 +08:00 |
|
cxt
|
c6799aae67
|
Ucloud测试版：答题之后查看答题情况界面中，问答题区域多了一根分隔线
|
2017-03-03 19:00:43 +08:00 |
|
cxt
|
20cfeba57f
|
Ucloud测试版：在线测验【允许学生查看结果】无法取消
|
2017-03-03 18:51:55 +08:00 |
|
huang
|
8d54187e04
|
周五内容
|
2017-03-03 18:49:56 +08:00 |
|
cxt
|
1fb0160ae5
|
Ucloud测试版：点击发送的在线测试，页面显示500
|
2017-03-03 18:43:26 +08:00 |
|
cxt
|
0de116c0af
|
竞赛讨论区帖子上传的附件，点击无法下载，提示无访问权限
|
2017-03-03 17:38:53 +08:00 |
|
cxt
|
2dab7d81ff
|
未登录时，竞赛页面点击左侧导航栏“提交”不应报没有权限，应该跳转到登录页面
|
2017-03-03 16:38:10 +08:00 |
|
cxt
|
181ccbf287
|
竞赛作品编辑时点击取消，返回的是错误页面
|
2017-03-03 16:25:13 +08:00 |
|
cxt
|
bf85e593a2
|
加入邀请码已停用的竞赛，提示信息内容错误
|
2017-03-03 16:17:02 +08:00 |
|
陈晓婷
|
70a9800c7e
|
Merge branch 'develop' into 'develop'
本周上线任务
See merge request !162
|
2017-03-03 15:40:13 +08:00 |
|
cxt
|
95595c6fe6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2017-03-03 15:37:55 +08:00 |
|
陈晓婷
|
6c8263dcf6
|
Merge branch 'develop' into 'develop'
周五上线内容
See merge request !161
|
2017-03-03 15:37:22 +08:00 |
|
cxt
|
6e1df8fd26
|
用户反馈（问吧）-编辑作业的bug
|
2017-03-03 15:09:00 +08:00 |
|
cxt
|
96312c6dfa
|
Merge branch 'cxt_course' into develop
|
2017-03-03 14:45:30 +08:00 |
|
cxt
|
4688fbaec9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-03-03 14:45:17 +08:00 |
|
cxt
|
f30507b6f0
|
在线测验改版
|
2017-03-03 14:43:51 +08:00 |
|
daiao
|
90f0dc47b8
|
超级管理员的待审批申请中，更改申请高校名称后，依然在待审批消息中显示
|
2017-03-03 11:13:00 +08:00 |