jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,100 Commits 98 Branches 0 Tags 0 B
Commit Graph

11859 Commits

Author SHA1 Message Date
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
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 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
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 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 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 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
cxt c6799aae67 Ucloud测试版：答题之后查看答题情况界面中，问答题区域多了一根分隔线 2017-03-03 19:00:43 +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 181ccbf287 竞赛作品编辑时点击取消，返回的是错误页面 2017-03-03 16:25:13 +08:00
cxt bf85e593a2 加入邀请码已停用的竞赛，提示信息内容错误 2017-03-03 16:17:02 +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
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
huang c14840ef83 实训项目基础框架搭建及相关关联 2017-03-02 15:44:56 +08:00
daiao 83e4a44062 我发布的Issue更换新HTML 2017-03-02 15:09:33 +08:00
daiao d75cf47079 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-02 13:44:46 +08:00
daiao 138a342613 首页左侧导航栏的底部地区为空时，不显示 2017-03-02 13:41:17 +08:00
daiao aa1d2854b0 项目动态回复栏展开更多后，无回复框 2017-03-02 11:07:55 +08:00
daiao c84383b357 导航栏搜索页面样式调整 2017-03-02 10:38:32 +08:00
daiao bf379ff716 项目的PullRequest的样式有问题 2017-03-02 10:23:55 +08:00
daiao abcaf33a17 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-02 09:45:45 +08:00
daiao 212fbc4e27 顶部导航搜索的项目，显示不正常 2017-03-02 09:42:35 +08:00
huang 3582f70a6b 局部刷新测试 2017-03-01 16:53:01 +08:00
daiao 20cc376246 注册激活页面的更换邮箱，更换一次之后，第二次弹框显示的原邮箱不正确 2017-03-01 15:51:12 +08:00
daiao 3430620f10 我发布的issue中，状态居中对齐 2017-03-01 13:49:21 +08:00
daiao f15d00f0bd 新建项目如果描述为空的时候显示怪异 2017-03-01 09:40:20 +08:00
huang cfd2161756 改动sleep时间 2017-02-28 21:11:14 +08:00
huang 7804ea69bd 项目动态ajax刷新 2017-02-28 20:50:40 +08:00
huang be1b507354 ajax刷新 2017-02-28 17:22:00 +08:00
daiao 7fbfeef8f3 首页显示的个人信息区域需要更新显示 2017-02-28 15:24:28 +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 b4e7bff6ce Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-28 10:13:09 +08:00
cxt 524dd85409 班级新建作业，加入题库时，没有将附件一起加入 2017-02-28 10:11:58 +08:00
daiao dda9858e21 注册激活页的留言，请更新留言的标题 2017-02-28 09:53:36 +08:00
cxt e28d635630 竞赛作品评分设置的问题 2017-02-27 17:17:29 +08:00
Linda ec6206d9d8 我的缺陷列表样式重写，需要重新加入后台元素 2017-02-27 17:00:43 +08:00
cxt 0544cd2746 从题库发送的题，与从题库选用的题，不应该再有“加入题库”选项 2017-02-27 15:44:11 +08:00
Linda e508477e7f 个人资料修改提示信息样式修改 
项目资源库上传按钮样式修改
 2017-02-27 14:18:02 +08:00
cxt dd1badcdc0 学生列表中如图点击查看学生的作业得分，鼠标在如图处本想拖动弹框，该弹框却关闭了，作业得分和社区得分的弹框改版 2017-02-27 11:13:23 +08:00
cxt 5f7fbf7362 新建作业时，如图弹出时间设置弹框，此时再将鼠标光标放在作业描述输入框中，建议时间弹框自动关闭 2017-02-27 10:22:38 +08:00
huang f459609c81 解决实训任务验证问题 用户名后添加导师 2017-02-25 11:08:37 +08:00
huang 5be7e048cf 没登陆情况不允许开启任务 2017-02-24 21:21:48 +08:00
huang 3abd2d4be6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 20:44:24 +08:00
cxt 1c7bbbf88d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 20:40:25 +08:00
cxt 03b7f91ed8 班级作业：如图分组作品“作品最终评分”显示的是扣分前的分，普通作业显示的却是扣分后的分，建议统一 2017-02-24 20:28:23 +08:00
daiao a50ddd201c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-24 20:15:03 +08:00
daiao 2aabaca9b6 实训项目序号只能输入数字或复制数字 2017-02-24 20:14:20 +08:00
cxt b3a62f7325 班级作业：如图分组作品“作品最终评分”显示的是扣分前的分，普通作业显示的却是扣分后的分，建议统一 2017-02-24 20:09:51 +08:00
cxt 6d3ab4f651 竞赛通知和班级通知不能回复 2017-02-24 20:00:31 +08:00
huang b510994365 竞赛添加访问统计 2017-02-24 19:42:23 +08:00
cxt ca706f3df5 从题库选用作业：编程作业变成普通作业时，编程相关的属性设置还存在 2017-02-24 19:11:29 +08:00
huang 821dbe0ac2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 18:59:54 +08:00
cxt 73f64e80a8 班级作业：新建作业时“从题库选用”编程作业，如图报500 2017-02-24 18:32:09 +08:00
huang 374323eb32 已经实训过的跳转问题 2017-02-24 17:43:43 +08:00
daiao e3d0551e51 合作伙伴的开源软件链接更为不可点击跳转 2017-02-24 16:35:48 +08:00
daiao f4ea11c4c2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-24 16:20:38 +08:00
daiao d05b3419d7 项目列表样式调整 2017-02-24 16:20:12 +08:00
陈晓婷 367dfbadee Merge branch 'develop' into 'develop' 
报500



See merge request !157
 2017-02-24 16:18:23 +08:00
cxt 544dfd356e 竞赛、课程、项目列表报500 2017-02-24 16:15:23 +08:00
黄井泉 af959a1260 Merge branch 'develop' into 'develop' 
本周上线任务



See merge request !156
 2017-02-24 15:35:17 +08:00
huang c613e29299 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 15:33:51 +08:00
huang bd0bd02084 权限控制 2017-02-24 15:33:15 +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 01484701d2 竞赛首页的简介下方直接显示竞赛动态 2017-02-24 15:14:09 +08:00
daiao 91017041ac 组织底部导航修改 2017-02-24 15:06:48 +08:00
daiao a1fee68d8b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-24 14:56:44 +08:00
daiao 47017f875a Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-24 14:52:06 +08:00
daiao a8588a5670 课程样式调整 2017-02-24 14:51:44 +08:00
huang 2e81633308 TPM TPi权限控制 2017-02-24 14:46:29 +08:00
cxt 3e3ad381b1 竞赛：改了提交截止日期，显示的还是提交已截止 2017-02-24 14:29:41 +08:00
huang 6e96f6e9ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 13:52:18 +08:00
cxt 0e40bf6daf 题库改版 2017-02-24 10:32:48 +08:00
huang 6e9ef8ee12 Merge branch 'develop' into dev_raining 
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/_base_project_top.html.erb
 2017-02-24 10:26:22 +08:00
huang 38e6b098c3 回复为0不显示 2017-02-24 10:01:08 +08:00
huang bd2d0d3869 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 
Conflicts:
	app/views/training_tasks/_content_list.html.erb
 2017-02-24 09:58:52 +08:00
daiao c76db2cb24 项目问题动态回复功能修复 2017-02-24 09:56:58 +08:00