 huang
|
48913a3c8c
|
公共方法封装
|
2017-03-20 14:51:07 +08:00 |
|
huang
|
57f74bb56c
|
自动化构建game
|
2017-03-17 17:16:10 +08:00 |
|
huang
|
0263165c2b
|
game中任务任务自动功能
ajax局部实现show and index
|
2017-03-17 12:42:58 +08:00 |
|
huang
|
59608d5f1d
|
challenge创建
|
2017-03-16 16:59:53 +08:00 |
|
huang
|
c7cf576aae
|
games下一关方法封装，部分模块封装
|
2017-03-15 17:15:41 +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
|
8bbee334c3
|
实训开启显示权限控制
|
2017-03-13 15:18:53 +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
|
6d182eca2c
|
shixun测试
|
2017-03-09 17:03:50 +08:00 |
|
huang
|
8526c409b5
|
build输出结果记录
|
2017-03-09 14:51:39 +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
|
3742757ae6
|
shixun job create
|
2017-03-07 18:19:50 +08:00 |
|
huang
|
dd31a55bdd
|
Merge branch 'develop' into dev_shixun_project
Conflicts:
db/schema.rb
|
2017-03-07 09:32:40 +08:00 |
|
huang
|
956a078a36
|
challeng模块新建、create
|
2017-03-06 17:36:01 +08:00 |
|
huang
|
8d54187e04
|
周五内容
|
2017-03-03 18:49:56 +08:00 |
 cxt
|
96312c6dfa
|
Merge branch 'cxt_course' into develop
|
2017-03-03 14:45:30 +08:00 |
|
huang
|
c14840ef83
|
实训项目基础框架搭建及相关关联
|
2017-03-02 15:44:56 +08:00 |
|
cxt
|
baabce13b2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
public/stylesheets/css/common.css
public/stylesheets/css/courses.css
|
2017-02-28 10:15:33 +08:00 |
|
cxt
|
524dd85409
|
班级新建作业，加入题库时，没有将附件一起加入
|
2017-02-28 10:11:58 +08:00 |
|
cxt
|
6329578f9b
|
没有登录平台或者没有加入竞赛的用户在点击作品提交时，请给出相应的提示
|
2017-02-27 14:12:49 +08:00 |
|
cxt
|
e658a5426d
|
班级作业加入题库，题库中该作业的引用数是零
|
2017-02-24 17:18:32 +08:00 |
|
cxt
|
099fcde246
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2017-02-24 15:20:34 +08:00 |
|
cxt
|
3e3ad381b1
|
竞赛：改了提交截止日期，显示的还是提交已截止
|
2017-02-24 14:29:41 +08:00 |
|
cxt
|
0e40bf6daf
|
题库改版
|
2017-02-24 10:32:48 +08:00 |
|
huang
|
b08a8e8050
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-22 15:52:05 +08:00 |
 daiao
|
06306e0214
|
实训项目叠层回复功能
|
2017-02-22 10:08:05 +08:00 |
|
huang
|
96aa9b7261
|
实训项目一些调整，api和结构
|
2017-02-22 08:54:38 +08:00 |
|
daiao
|
544432adce
|
实训任务详情页面的一级回复功能
|
2017-02-21 14:38:05 +08:00 |
|
huang
|
336c28ccdb
|
实训项目权限控制
|
2017-02-20 12:33:27 +08:00 |
|
huang
|
82c6799953
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
Conflicts:
db/schema.rb
|
2017-02-19 14:40:27 +08:00 |
|
huang
|
df66e6d60c
|
启动任务相关接口
|
2017-02-19 14:39:15 +08:00 |
|
daiao
|
77f58d76a5
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop
# Conflicts:
# db/schema.rb
|
2017-02-19 09:21:55 +08:00 |
|
huang
|
d4eb4c0d56
|
实训任务模块
|
2017-02-17 19:29:00 +08:00 |
|
cxt
|
c1301bbd7d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-17 15:02:24 +08:00 |
|
cxt
|
b81d9b86c4
|
班级的配置页面，管理员增加“更换管理员”功能
|
2017-02-17 15:00:14 +08:00 |
|
cxt
|
aefd4973c2
|
在线测验的新建、编辑改版
|
2017-02-17 09:03:43 +08:00 |
|
daiao
|
cb5548c853
|
博客回复发送的消息，点击之后没有自动更新为已读
|
2017-02-16 15:18:35 +08:00 |
|
cxt
|
c16f63a8b4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
public/stylesheets/css/courses.css
|
2017-02-15 11:15:09 +08:00 |
|
cxt
|
9be2cb56a1
|
Revert "Revert "测验头部和新建题目的改版""
This reverts commit 5a6e64beb2.
Conflicts:
db/schema.rb
public/stylesheets/css/courses.css
|
2017-02-15 11:12:10 +08:00 |
|
daiao
|
2cad08614f
|
系统发出的加入班级\项目\竞赛消息通知,点击后自动变为已读（并优化消息代码结构）
|
2017-02-15 10:54:09 +08:00 |
|
daiao
|
1f2fadc9f6
|
消息结构优化
|
2017-02-15 10:03:09 +08:00 |
|
cxt
|
89eab427aa
|
班级统计中的项目活跃度增加按作业过滤
|
2017-02-14 15:07:38 +08:00 |
|
cxt
|
4a0310f88c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/public.css
|
2017-02-10 14:37:28 +08:00 |
|
cxt
|
e4ebd4dd2c
|
班级的统计模块显示“活跃度”、“英雄榜”、“项目活跃度”(单个作业的过滤未完成)
|
2017-02-10 14:35:43 +08:00 |
|
daiao
|
eb5ee64825
|
对于隐藏版本库的项目，版本库对报告人员不可见
|
2017-02-10 11:13:02 +08:00 |
|
daiao
|
3e705fabb8
|
平台底部调整（去除底部图片，增加合作伙伴一栏）
|
2017-02-09 10:47:18 +08:00 |
|
daiao
|
574f491b56
|
Issue新建页面的指派者，按照姓名排序
|
2017-02-07 15:15:10 +08:00 |