 daiao
|
f2e337fb12
|
fork存在的时候则不重复fork
|
2017-03-24 17:37:00 +08:00 |
|
daiao
|
e198979738
|
实训任务
|
2017-03-24 17:13:06 +08:00 |
|
daiao
|
d008b654b7
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 17:07:18 +08:00 |
|
daiao
|
839a408a82
|
实训
|
2017-03-24 17:07:03 +08:00 |
 huang
|
2db5997363
|
添加文件路径
|
2017-03-24 17:06:22 +08:00 |
|
huang
|
a4be04b67a
|
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-24 16:53:19 +08:00 |
|
huang
|
ac641f64c4
|
jenkins地址写入配置文件
|
2017-03-24 16:52:08 +08:00 |
|
daiao
|
c9aa296ead
|
开始挑战点击后隐藏
|
2017-03-24 16:48:58 +08:00 |
|
huang
|
69d35b347d
|
开启实训的时候数据一致性
|
2017-03-24 16:42:58 +08:00 |
|
daiao
|
3059559f76
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 16:32:36 +08:00 |
|
daiao
|
df688f8e4e
|
实训提交修改
|
2017-03-24 16:32:18 +08:00 |
 cxt
|
c6f05eafc7
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 16:17:08 +08:00 |
|
cxt
|
e3150716f3
|
Merge branch 'dev_bigdata' into dev_shixun_project
Conflicts:
app/views/layouts/_footer.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/new_base.html.erb
app/views/layouts/new_base_user.html.erb
db/schema.rb
public/stylesheets/css/structure.css
public/stylesheets/font/FontAwesome.otf
public/stylesheets/font/fontawesome-webfont.eot
public/stylesheets/font/fontawesome-webfont.svg
public/stylesheets/font/fontawesome-webfont.ttf
public/stylesheets/font/fontawesome-webfont.woff
public/stylesheets/font2/FontAwesome.otf
public/stylesheets/font2/fontawesome-webfont.eot
public/stylesheets/font2/fontawesome-webfont.svg
public/stylesheets/font2/fontawesome-webfont.ttf
public/stylesheets/font2/fontawesome-webfont.woff
public/stylesheets/fonts/FontAwesome.otf
public/stylesheets/fonts/fontawesome-webfont.eot
public/stylesheets/fonts/fontawesome-webfont.svg
public/stylesheets/fonts/fontawesome-webfont.ttf
public/stylesheets/fonts/fontawesome-webfont.woff
|
2017-03-24 16:17:01 +08:00 |
 Linda
|
37870ed0a6
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 16:07:54 +08:00 |
|
Linda
|
29c93cfb95
|
增加路径
|
2017-03-24 16:07:22 +08:00 |
|
cxt
|
324d14ee92
|
新版登录和注册
|
2017-03-24 16:05:52 +08:00 |
|
huang
|
e1600e9daf
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 16:00:38 +08:00 |
|
huang
|
cacf0f1354
|
一些统计
|
2017-03-24 15:59:52 +08:00 |
|
Linda
|
587b4b73e0
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 15:43:02 +08:00 |
|
daiao
|
67e74118c4
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 15:41:50 +08:00 |
|
daiao
|
10dc5a9668
|
点击开启评测 无感知
|
2017-03-24 15:41:33 +08:00 |
|
Linda
|
6c62d7be0b
|
头部标题样式修改
删除成功提示
|
2017-03-24 15:41:29 +08:00 |
|
huang
|
3231f96b5f
|
完成首次进入展示代码功能
|
2017-03-24 15:31:16 +08:00 |
|
Linda
|
b3569d9c61
|
新建编辑页面，tag新增显示效果
|
2017-03-24 15:13:56 +08:00 |
|
huang
|
001a3796c7
|
根目录刷新显示页面
|
2017-03-24 15:05:44 +08:00 |
|
huang
|
27c34985ca
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 14:42:32 +08:00 |
|
huang
|
b3141348b0
|
版本库默认打开设置文件
|
2017-03-24 14:42:10 +08:00 |
|
Linda
|
5925b975f2
|
全部任务tag样式修改
|
2017-03-24 14:20:27 +08:00 |
|
Linda
|
8b907ff973
|
配置实训KE编辑器宽度修改
|
2017-03-24 14:10:57 +08:00 |
|
Linda
|
82fdb9c867
|
导航选中样式修改
新建实训选中提示修改
|
2017-03-24 14:05:47 +08:00 |
|
daiao
|
93e67e5dbc
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 12:39:01 +08:00 |
|
daiao
|
9e6a146d43
|
保存按钮放回原来地方
|
2017-03-24 12:38:44 +08:00 |
|
huang
|
9e5ba45b5c
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 12:34:16 +08:00 |
|
huang
|
8b3fae60a1
|
output64位编码
|
2017-03-24 12:33:58 +08:00 |
|
daiao
|
aa02211971
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 12:30:29 +08:00 |
|
daiao
|
52d642b51b
|
默认分支
|
2017-03-24 12:30:10 +08:00 |
|
huang
|
fbce9fb028
|
打印报错信息
|
2017-03-24 10:59:28 +08:00 |
|
huang
|
41ddd9b2a2
|
提示信息错误
|
2017-03-24 10:54:36 +08:00 |
|
huang
|
0654222dee
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 10:43:41 +08:00 |
|
daiao
|
932240737c
|
谷歌浏览器不兼容关闭
|
2017-03-24 10:43:13 +08:00 |
|
huang
|
e8e1a899fe
|
current_task
|
2017-03-24 10:42:51 +08:00 |
|
huang
|
b77ba2b751
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 10:38:45 +08:00 |
|
huang
|
f8a05e72d1
|
为0的时候不显示
|
2017-03-24 10:38:30 +08:00 |
|
daiao
|
0dd140749c
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 10:28:39 +08:00 |
|
daiao
|
80835ab8dc
|
实训编辑模式样式调整
|
2017-03-24 10:28:20 +08:00 |
|
huang
|
fdf71d33b3
|
message存入数据库
|
2017-03-24 10:22:03 +08:00 |
|
huang
|
2326e25dba
|
开启实训前的一些提示
|
2017-03-24 10:15:49 +08:00 |
|
huang
|
28f9915d41
|
下一关权限判断
|
2017-03-24 10:03:10 +08:00 |
|
huang
|
a4bee495a2
|
下一关的一些改进
|
2017-03-24 10:00:06 +08:00 |
|
huang
|
c4ffa20461
|
权限控制，及修改获取当前任务的方法
|
2017-03-24 09:45:01 +08:00 |