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

15569 Commits

Author SHA1 Message Date
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
cxt c4d9f3c67c Merge branch 'develop' into dev_bigdata 
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-15 15:28:56 +08:00
daiao 8f2a040fee 实训配置界面 2017-03-15 15:15:55 +08:00
cxt fcae5e9690 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-15 14:55:11 +08:00
cxt 0ed7f92cc5 班级删除学生不成功 2017-03-15 14:54:39 +08:00
cxt 3b4b069348 头像上传代码还原 2017-03-15 14:47:54 +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
cxt a1509088e4 头像获取延迟一秒 2017-03-14 16:51:55 +08:00
cxt 2d38af7c3d 头像上传加打印输出 2017-03-14 16:42:08 +08:00
cxt 9468257c0c 头像上传 2017-03-14 16:30:04 +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
cxt 2520058a5d 组织子域名申请流程问题 2017-03-14 15:17:46 +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
cxt 4e2f82a187 分组作业和团队竞赛在提交或修改作品时，选择“合作成员“的弹框中无法选择的成员提示不够明显 2017-03-14 14:35:14 +08:00
huang 38ff90a8bf myshixun模板 2017-03-14 11:25:01 +08:00
daiao 30a33b967f 问吧点击综合排序无效 2017-03-14 10:57:16 +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
cxt e1c8fccf00 发布了竞赛题和发布了作业的消息链接改为跳转到作品列表（基于项目的分组作业不应该直接跳转到新建页面） 2017-03-14 09:35:56 +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
daiao 8866b91c8f 项目主页动态列表中@功能不正常（课程应该也好了） 2017-03-13 17:25:36 +08:00
cxt 931022c7b1 团队竞赛补交作品 2017-03-13 17:18:36 +08:00
cxt bb5522332c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-13 16:59:03 +08:00
陈晓婷 7a3e1a6a75 Merge branch 'develop' into 'develop' 
竞赛相关



See merge request !174
 2017-03-13 16:58:52 +08:00
cxt 54a4a189be 作品附件打包下载调整到500M 2017-03-13 16:57:46 +08:00
daiao 376847689a 课程动态二级回复，讨论区一级/二级回复增加AT功能 2017-03-13 15:59:28 +08:00
daiao cfcf12d7ed 强制修改资料页面，点击base弹出空白页问题 2017-03-13 15:21:46 +08:00
huang 8bbee334c3 实训开启显示权限控制 2017-03-13 15:18:53 +08:00
cxt 15b1a82cd4 竞赛作品允许补交 2017-03-13 15:11:28 +08:00
huang 90efe7cc35 tpm版本库目录功能 2017-03-13 14:55:18 +08:00
huang 47e87b115a flash闪存处理 2017-03-13 14:37:39 +08:00
cxt 55573d2016 放宽下载附件限制 2017-03-13 14:28:47 +08:00
cxt 907dcf1f7d 班级的统计-英雄榜中，在列表右上角增加“导出作业成绩”功能按钮 2017-03-13 14:23:23 +08:00
huang 0298c45b20 shixun模块版本库创建事务一致性处理 2017-03-13 14:12:34 +08:00
cxt 2b16c45ff1 消息头像有问题 2017-03-13 13:48:11 +08:00
cxt b1f19ccb5f 无权限下载 2017-03-13 11:29:03 +08:00
cxt afe439abf3 管理员下载竞赛作品附件报没权限 2017-03-13 11:15:10 +08:00
cxt c67288de0d 竞赛组长提交作品时，选择项目成员，无需验证其是否是竞赛成员 2017-03-13 10:30:09 +08:00
cxt a859f954d2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-13 10:28:29 +08:00
cxt 77c25db233 竞赛者加入，无需身份验证，发送消息通知给竞赛所有管理员即可 2017-03-13 10:22:55 +08:00
huang fbc52a7892 games模块相关功能 2017-03-13 09:00:13 +08:00
huang 828dce5d07 修复500问题 2017-03-12 12:09:29 +08:00
huang a43167c6cf 修复500 2017-03-12 11:53:15 +08:00
huang 18cd52a0bb 竞赛500问题 2017-03-12 09:01:09 +08:00
cxt b318c460d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-10 18:02:43 +08:00
daiao a26c93c680 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-10 17:57:02 +08:00
cxt c20b7fff43 新建/编辑作品的截止时间显示 2017-03-10 17:54:40 +08:00
daiao 219d1d7a4a 自己无法置顶自己的帖子 2017-03-10 17:26:41 +08:00
daiao 2e6a89bf48 修改个人资料报500 2017-03-10 17:09:14 +08:00
huang 6183db782a games模块开发 2017-03-10 15:41:44 +08:00
cxt 35b9dc0275 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-10 15:41:40 +08:00
陈晓婷 c288754485 Merge branch 'develop' into 'develop' 
问吧置顶功能



See merge request !166
 2017-03-10 15:41:26 +08:00
daiao 22367b0d0a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-10 15:40:48 +08:00
cxt d5472f667b 课程的logo在更新时会出现不显示的情况，显示的是一个文本的？ 2017-03-10 15:39:05 +08:00
daiao 4881b2555c 贴吧吧主能置顶帖子 2017-03-10 15:18:24 +08:00
cxt d0e73c12ff 讨论区的消息状态更新 2017-03-10 14:59:24 +08:00
cxt 34dee33edb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/boards/_course_new.html.erb
	db/schema.rb
 2017-03-10 13:57:44 +08:00
陈晓婷 66553a2a5e Merge branch 'develop' into 'develop' 
本周任务上线



See merge request !164
 2017-03-10 13:55:31 +08:00
daiao 378ef6add5 项目issue二级回复，讨论区帖子一级回复 2017-03-10 11:15:53 +08:00
huang 5a2c7a4830 post请求登录过滤 2017-03-09 17:51:03 +08:00
huang 6d182eca2c shixun测试 2017-03-09 17:03:50 +08:00
daiao a9fb270b54 问吧的帖子，吧主和超级管理员有置顶权限 2017-03-09 16:42:30 +08:00
cxt f4f0363b40 作业评分设置的弹框页面显示问题 2017-03-09 15:45:53 +08:00
cxt 42b22ddb83 作业小齿轮中的“启用/禁用匿评”功能的完善 2017-03-09 15:45:08 +08:00
huang 8526c409b5 build输出结果记录 2017-03-09 14:51:39 +08:00
cxt 149b837aff 作业启用匿评的默认设置出错，只余一天的期间了 2017-03-09 13:58:53 +08:00
daiao 401880bc26 班级贴子的消息点击之后，不会变成已读 2017-03-09 11:19:54 +08:00
cxt 42ab249651 小铃铛的数字标识和事情情况有冲突 2017-03-09 10:58:46 +08:00
huang 679a6274e6 版本库删除功能 2017-03-08 18:32:08 +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
daiao 0b0ca61f1c 登录名不能被修改 2017-03-08 16:12:50 +08:00
huang e753d0453c 实训开启后完成任务的自动创建 2017-03-08 15:37:48 +08:00
huang 622b7a4979 TPI开启任务模块 2017-03-08 14:59:40 +08:00
cxt b83299772c 竞赛帖子消息点击之后刷新，没有变成已读 2017-03-08 10:22:05 +08:00
cxt 7de40ac88b 用户反馈（微信群）-评分作品被修改的提醒 2017-03-08 09:54:15 +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
daiao 33caf7821f 超级管理员的单位审批，“更改”弹框的单位名称无法匹配 2017-03-07 17:25:23 +08:00
cxt b8856f845a 测验结果列表增加检索条件 2017-03-07 15:39:37 +08:00
daiao e88918916a 点击消息后红色按钮不消失 2017-03-07 14:19:17 +08:00
huang 4b825ecd22 challenge列表页面 2017-03-07 13:43:21 +08:00
cxt 69e3c8e893 在线测试得分是否显示应该分情况 2017-03-07 11:14:47 +08:00
daiao 1d6fb6849a 里程碑修改，报名称重复 2017-03-07 11:12:37 +08:00
huang ca6058d120 项目删除功能 2017-03-07 10:58:50 +08:00
daiao 19684099b8 用户的消息通知中，关于留言回复的链接内容不正确 2017-03-07 10:30:58 +08:00
cxt 8f856da568 在线测试试卷保存后应该支持发布 2017-03-07 10:17:14 +08:00
daiao f8c9ba8566 超级管理员的用户列表页，状态为“全部”时，创建时间排序无效 2017-03-07 09:57:37 +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
daiao 4bb239a944 编程作业报系统繁忙的问题 2017-03-07 08:48:40 +08:00
huang 956a078a36 challeng模块新建、create 2017-03-06 17:36:01 +08:00
cxt 6f3f54b1a8 竞赛基于项目的团队提交，在创建项目时点击取消，应该回到作业页面 2017-03-06 17:25:05 +08:00
cxt f0b7846453 班级资源延期发布的输入框不应该允许用户手动编辑 2017-03-06 15:45:25 +08:00
huang ca118e2bef 版本库分离 2017-03-06 14:56:34 +08:00
cxt 686cf8b926 最近登录用户列表中无法正确显示单位名称 2017-03-06 14:40:16 +08:00
cxt 54c16753cb 竞赛讨论区，非创建者的管理员用户，没有帖子置顶的功能 2017-03-06 14:13:59 +08:00
cxt dd0cb87d4f 班级讨论区的助教没有帖子置顶功能 2017-03-06 11:19:51 +08:00
cxt 0141735db4 问吧帖子回复的时候，二级回复的Url没有自动调整为超链接 2017-03-06 11:03:33 +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
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 7763ce0d66 添加数据 2017-02-28 21:56:39 +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
huang 5740204301 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-28 09:56:13 +08:00
huang ada7962231 成功的时候才更新状态 2017-02-28 09:55:42 +08:00
daiao dda9858e21 注册激活页的留言，请更新留言的标题 2017-02-28 09:53:36 +08:00
daiao 5e4c96e864 Issue回复的@功能失效了 2017-02-28 09:32:20 +08:00
huang 1f3a13b933 任务提醒描述修改 2017-02-27 17:22:10 +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
cxt 66d6eab161 编辑挂起状态的班级作业，保存报错 2017-02-27 14:50:13 +08:00
Linda e508477e7f 个人资料修改提示信息样式修改 
项目资源库上传按钮样式修改
 2017-02-27 14:18:02 +08:00
cxt 6329578f9b 没有登录平台或者没有加入竞赛的用户在点击作品提交时，请给出相应的提示 2017-02-27 14:12:49 +08:00
cxt dd1badcdc0 学生列表中如图点击查看学生的作业得分，鼠标在如图处本想拖动弹框，该弹框却关闭了，作业得分和社区得分的弹框改版 2017-02-27 11:13:23 +08:00
cxt 5f7fbf7362 新建作业时，如图弹出时间设置弹框，此时再将鼠标光标放在作业描述输入框中，建议时间弹框自动关闭 2017-02-27 10:22:38 +08:00
huang 3bda887144 修改position提示 2017-02-26 22:50:34 +08:00
huang fce24d11a9 gitUrl转码 2017-02-26 20:51:25 +08:00
huang e2280d5da7 传gitlab地址 2017-02-26 20:44:44 +08:00
huang aec9a1dcce msg 解码； 传gitUrl 2017-02-26 20:37:02 +08:00
huang 4127022891 修改参数名 2017-02-25 19:55:47 +08:00
huang 011a0d7d36 添加任务序号 2017-02-25 19:43:49 +08:00
huang f459609c81 解决实训任务验证问题 用户名后添加导师 2017-02-25 11:08:37 +08:00
黄井泉 8d41cecf72 Merge branch 'guange_dev' into 'develop' 
任务状态去掉认证



See merge request !159
 2017-02-24 22:19:35 +08:00
guange 6e827a3a8c 任务状态去掉认证 2017-02-24 22:16:35 +08:00
huang 9f92eff178 task编辑问题 2017-02-24 22:09:25 +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 a6bf791358 讨论区如图分页当前页为最后一页，点击下一页建议返回第一页 2017-02-24 20:38:49 +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
huang c33ab7735f 任务发送修改 2017-02-24 19:16:43 +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
cxt 29e22f0c6c 刚新建的班级作业，评分设置中最终得分“助教+匿评”的默认比例错了 2017-02-24 17:42:15 +08:00
cxt e658a5426d 班级作业加入题库，题库中该作业的引用数是零 2017-02-24 17:18:32 +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
huang d76e34889a task不重复执行 2017-02-24 13:42:58 +08:00
huang 30c14c2e07 任务启动回调逻辑控制 2017-02-24 12:30:36 +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
daiao 9e7ce0fd6a 实训任务样式调整 2017-02-24 09:41:15 +08:00
huang 658023cbe0 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-24 09:04:07 +08:00
daiao 4885ec5afb Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 17:26:35 +08:00
daiao 9697a9b5c1 实训项目展开/收起回复加载KE 2017-02-23 17:26:22 +08:00
huang 7074cbdba6 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 17:24:12 +08:00
huang 019ce762f8 针对实训子项目，一些权限修改 2017-02-23 17:23:52 +08:00
Linda 2fb75fdb4d Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 17:14:32 +08:00
Linda b369b9c281 实训任务标题样式修改 2017-02-23 17:13:56 +08:00
daiao 75f1fc964a 实训任务项目动态展开更多与收起回复功能 2017-02-23 17:09:22 +08:00
huang 705f94428e Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 16:18:16 +08:00
huang 49f63992d8 任务开启的时候权限控制 2017-02-23 16:17:37 +08:00
daiao f817aef5d2 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 16:13:16 +08:00
daiao 1e56a69eed 动态消息的实训动态添加回复/二级回复功能 2017-02-23 16:12:29 +08:00
Linda 95f06e50ff 实训任务动态标题样式修改 2017-02-23 16:01:23 +08:00
huang 6bd160d642 样式问题 2017-02-23 15:46:07 +08:00
huang 0e48262407 动态中提交评测ajax局部刷新 2017-02-23 15:27:10 +08:00
huang 6f06fde7dc Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 14:13:47 +08:00
huang 727a6fd536 实训项目一些封装 2017-02-23 14:13:25 +08:00
daiao 31d852cd60 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 13:40:07 +08:00
daiao 6d14cb131a 问吧右下角贴吧排序按照帖子发布数和回帖数之和排序 2017-02-23 13:39:44 +08:00
huang 384ae2764a Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 10:45:50 +08:00
huang 9a3793ffa9 完成training_task 编辑功能 2017-02-23 10:45:28 +08:00
daiao b36c249a6b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 10:29:21 +08:00
Linda e1be2fda81 实训任务提交测评显示状态增加样式 2017-02-23 10:25:55 +08:00
daiao 7e04e67a5b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 10:10:59 +08:00
daiao 8bd9fc81d6 账号未激活提示页提交留言机制修改（从发送到管理员留言改到贴吧） 2017-02-23 10:09:56 +08:00
huang 04edefac8b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 09:47:39 +08:00
huang ac77c26c50 task写入项目动态中 2017-02-23 09:47:15 +08:00