Commit Graph

5672 Commits

Author SHA1 Message Date
daiao 20cc376246 注册激活页面的更换邮箱,更换一次之后,第二次弹框显示的原邮箱不正确 2017-03-01 15:51:12 +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
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 5e4c96e864 Issue回复的@功能失效了 2017-02-28 09:32:20 +08:00
huang 1f3a13b933 任务提醒描述修改 2017-02-27 17:22:10 +08:00
cxt 0544cd2746 从题库发送的题,与从题库选用的题,不应该再有“加入题库”选项 2017-02-27 15:44:11 +08:00
cxt 66d6eab161 编辑挂起状态的班级作业,保存报错 2017-02-27 14:50:13 +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
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 6d3ab4f651 竞赛通知和班级通知不能回复 2017-02-24 20:00:31 +08:00
huang c33ab7735f 任务发送修改 2017-02-24 19:16:43 +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
黄井泉 af959a1260 Merge branch 'develop' into 'develop'
本周上线任务



See merge request !156
2017-02-24 15:35:17 +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
huang 2e81633308 TPM TPi权限控制 2017-02-24 14:46:29 +08:00
cxt 3e3ad381b1 竞赛:改了提交截止日期,显示的还是提交已截止 2017-02-24 14:29:41 +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 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
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 1e56a69eed 动态消息的实训动态添加回复/二级回复功能 2017-02-23 16:12:29 +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 9a3793ffa9 完成training_task 编辑功能 2017-02-23 10:45:28 +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
daiao 8d51e896fa Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 09:32:36 +08:00
daiao fa7b15db47 注册成功提示页与账号未激活提示页,增加‘更换邮箱的功能’ 2017-02-23 09:32:13 +08:00
huang 006608dca8 修改参数名 2017-02-22 16:30:16 +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
huang eeba0c362d 实训项目一些ajax控制 2017-02-22 15:49:37 +08:00
huang 3f105cefe7 版本库访问权限控制清理 2017-02-22 12:33:45 +08:00
huang 0629b31e53 解决部分项目(比如:594)切换版本库分支500问题 2017-02-22 10:14:04 +08:00
daiao 06306e0214 实训项目叠层回复功能 2017-02-22 10:08:05 +08:00
huang 96aa9b7261 实训项目一些调整,api和结构 2017-02-22 08:54:38 +08:00
daiao 4a925201eb 实训任务增加二级回复功能 2017-02-21 17:23:44 +08:00
daiao 43c990c0a9 二级回复功能(回复未刷新) 2017-02-21 16:24:30 +08:00
huang e6deabadba 后台作业列表添加编程作业过滤 2017-02-21 14:45:18 +08:00
daiao 818d7ad2ef Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 14:38:32 +08:00
daiao 544432adce 实训任务详情页面的一级回复功能 2017-02-21 14:38:05 +08:00
huang f59243ab9f 实训api改进及一些提醒 2017-02-21 14:34:17 +08:00
huang 8063932500 fork项目的时候一并forkmodule 2017-02-20 14:23:02 +08:00
huang 336c28ccdb 实训项目权限控制 2017-02-20 12:33:27 +08:00
huang e5cfc7280b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-19 17:50:17 +08:00
huang 8d1987567e 实训项目相关模块相关api的开发 2017-02-19 17:49:58 +08:00
daiao 2aa025cf32 实训项目新建页面样式调整 2017-02-19 15:17:46 +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
cxt c3cd2ea153 班级的编程作业在新建和编辑时,需要增加输入输出样例的录入入口 2017-02-18 18:00:52 +08:00
huang a43c5cdb2f 启动实训Api等 2017-02-18 17:44:50 +08:00
huang d4eb4c0d56 实训任务模块 2017-02-17 19:29:00 +08:00
cxt c6ae00c6be 作品列表出现重复的数据 2017-02-17 18:54:15 +08:00
cxt 24f766d0a5 更换管理员发送微信模板消息 2017-02-17 16:19:49 +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 2c42a51195 平台管理员的首页报500 2017-02-17 09:00:35 +08:00
daiao cb5548c853 博客回复发送的消息,点击之后没有自动更新为已读 2017-02-16 15:18:35 +08:00
daiao 9af54a9288 我发布的issue列表,标题没有居中对齐,视觉上有错位 2017-02-16 14:09:15 +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 8756bd7061 一个学生的匿评申诉被接受一次,但是违规匿评扣分却扣了两次、
匿评申诉被处理后,无论是申诉人还是被申诉人,都收到了2条一样的消息通知
2017-02-13 14:34:14 +08:00
cxt 4cd573efe6 匿评申诉为被处理时,仅申诉人看到的界面显示少了分隔线(其它用户的界面显示正常) 2017-02-13 14:12:46 +08:00
cxt c3b237af67 学生匿评:第一次匿评,分数都不能自动刷新 2017-02-10 17:57:30 +08:00
cxt f844e44675 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-10 17:13:02 +08:00
cxt 6ccc53b089 班级统计中“活跃度”未完全统计 2017-02-10 17:04:10 +08:00
daiao 271cb31f18 上线测试版缺陷修复 2017-02-10 16:01:55 +08:00