 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 |
|
daiao
|
8f2a040fee
|
实训配置界面
|
2017-03-15 15:15:55 +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 |
|
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 |
|
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 |
|
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 |