Commit Graph

1852 Commits

Author SHA1 Message Date
cxt 3cdf8c8a57 组员同评时组员的评分消息不应为“重新评阅” 2017-04-07 16:51:50 +08:00
cxt 161990a3de 老师所在班级,助教新建的题,无法加到老师的题库 2017-03-30 17:27:33 +08:00
cxt 2a7a8fcdb4 班级作业的最终得分设置修改,由用户决定教师、助教和匿评的百分比计算 2017-03-30 15:31:07 +08:00
cxt 59b4bb22c4 班级测验:底部按钮显示有问题 2017-03-24 18:36:51 +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
cxt 149b837aff 作业启用匿评的默认设置出错,只余一天的期间了 2017-03-09 13:58:53 +08:00
cxt 42ab249651 小铃铛的数字标识和事情情况有冲突 2017-03-09 10:58:46 +08:00
cxt 7de40ac88b 用户反馈(微信群)-评分作品被修改的提醒 2017-03-08 09:54:15 +08:00
huang ca6058d120 项目删除功能 2017-03-07 10:58:50 +08:00
cxt 0544cd2746 从题库发送的题,与从题库选用的题,不应该再有“加入题库”选项 2017-02-27 15:44:11 +08:00
cxt 6d3ab4f651 竞赛通知和班级通知不能回复 2017-02-24 20:00:31 +08:00
cxt e658a5426d 班级作业加入题库,题库中该作业的引用数是零 2017-02-24 17:18:32 +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
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 49f63992d8 任务开启的时候权限控制 2017-02-23 16:17:37 +08:00
huang ac77c26c50 task写入项目动态中 2017-02-23 09:47:15 +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
cxt f41341a3d4 班级成员列表报500 2017-02-22 10:35:33 +08:00
huang 96aa9b7261 实训项目一些调整,api和结构 2017-02-22 08:54:38 +08:00
daiao 544432adce 实训任务详情页面的一级回复功能 2017-02-21 14:38:05 +08:00
huang 336c28ccdb 实训项目权限控制 2017-02-20 12:33:27 +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 78614e18ca 添加学生报错 2017-02-17 19:01:53 +08:00
cxt c6ae00c6be 作品列表出现重复的数据 2017-02-17 18:54:15 +08:00
cxt c0de119969 班级统计活跃度中“班级留言”统计错误 2017-02-10 17:36:23 +08:00
cxt 6ccc53b089 班级统计中“活跃度”未完全统计 2017-02-10 17:04:10 +08:00
cxt 18ea262f34 班级配置-添加成员-角色编辑:将角色编辑为教师或助教单个角色时,点击保存无反应 2017-02-10 16:11:33 +08:00
cxt e4ebd4dd2c 班级的统计模块显示“活跃度”、“英雄榜”、“项目活跃度”(单个作业的过滤未完成) 2017-02-10 14:35:43 +08:00
cxt 65bfaedb3a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2017-01-20 13:56:34 +08:00
cxt 2995c05b06 sw_1用户访问875班级却报403 2017-01-20 11:16:35 +08:00
huang 74ed832b68 开源检索数据迁移 2017-01-20 10:25:15 +08:00
cxt ac80805932 班级统计功能(暂未完成) 2017-01-20 10:16:51 +08:00
huang 94822a5c95 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2017-01-20 09:57:05 +08:00
huang 5a961c8ee7 解决blog删除、blog回复500问题 2017-01-19 17:26:26 +08:00
daiao a2aea42868 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-19 15:57:55 +08:00
cxt 17b6babd5b 竞赛通知的回复,多级回复时,消息发送对象错误 2017-01-18 15:02:23 +08:00
cxt ac713a7136 竞赛发布留言、回复留言的消息通知 2017-01-18 14:13:25 +08:00
huang 9734c46b2f 个人主页申请类消息查询性能优化,申请类消息方法修改 2017-01-17 16:21:32 +08:00
huang 55d16eb589 完成组织域名申请消息重构 2017-01-17 13:22:03 +08:00
daiao e03d80de69 贴吧帖子创建人删除帖子报“页面不存在”的问题 2017-01-16 15:28:56 +08:00
huang b36089c45d 项目申请类消息处理 2017-01-16 11:31:10 +08:00
daiao cd76f92405 博客回复消息加入小铃铛;申请加入项目的操作样式修改 2017-01-13 17:00:43 +08:00
daiao 0591440c9e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_user_message_forge.html.erb
	db/schema.rb
2017-01-13 11:28:33 +08:00
黄井泉 c177230b08 Merge branch 'develop' into 'develop'
这周上线任务



See merge request !122
2017-01-13 11:24:07 +08:00
cxt 5251ab9ca2 为班级新添加的学生创建已发布作业的作品,状态为未提交 2017-01-12 17:27:04 +08:00
cxt cd23ba37b5 作业评价时,此次评价会覆盖该账号上传评价的信息,请在评分详情的页面上增加历史评分的隐藏功能 2017-01-12 17:25:16 +08:00