Commit Graph

5672 Commits

Author SHA1 Message Date
cxt 357b7c5aa0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-17 14:30:44 +08:00
陈晓婷 676ef6e176 Merge branch 'develop' into 'develop'
周一修改的内容



See merge request !175
2017-03-17 14:30:26 +08:00
cxt f520d641ab 更新设置了延期发布的班级资源时,延期发布设置会丢失,且没有提醒 2017-03-17 13:55:21 +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
cxt 9468257c0c 头像上传 2017-03-14 16:30:04 +08:00
cxt 2520058a5d 组织子域名申请流程问题 2017-03-14 15:17:46 +08:00
daiao 30a33b967f 问吧点击综合排序无效 2017-03-14 10:57:16 +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
cxt 15b1a82cd4 竞赛作品允许补交 2017-03-13 15:11:28 +08:00
cxt 55573d2016 放宽下载附件限制 2017-03-13 14:28:47 +08:00
cxt afe439abf3 管理员下载竞赛作品附件报没权限 2017-03-13 11:15:10 +08:00
cxt c20b7fff43 新建/编辑作品的截止时间显示 2017-03-10 17:54:40 +08:00
cxt d5472f667b 课程的logo在更新时会出现不显示的情况,显示的是一个文本的? 2017-03-10 15:39:05 +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
daiao a9fb270b54 问吧的帖子,吧主和超级管理员有置顶权限 2017-03-09 16:42:30 +08:00
cxt 42b22ddb83 作业小齿轮中的“启用/禁用匿评”功能的完善 2017-03-09 15:45:08 +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
cxt b83299772c 竞赛帖子消息点击之后刷新,没有变成已读 2017-03-08 10:22:05 +08:00
cxt 7de40ac88b 用户反馈(微信群)-评分作品被修改的提醒 2017-03-08 09:54:15 +08:00
cxt b8856f845a 测验结果列表增加检索条件 2017-03-07 15:39:37 +08:00
daiao e88918916a 点击消息后红色按钮不消失 2017-03-07 14:19:17 +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 f8c9ba8566 超级管理员的用户列表页,状态为“全部”时,创建时间排序无效 2017-03-07 09:57:37 +08:00
huang 065cd95714 删除项目后依旧能fork项目功能 2017-03-07 09:25:51 +08:00
daiao 4bb239a944 编程作业报系统繁忙的问题 2017-03-07 08:48:40 +08:00
cxt 6f3f54b1a8 竞赛基于项目的团队提交,在创建项目时点击取消,应该回到作业页面 2017-03-06 17:25:05 +08:00
cxt 20cfeba57f Ucloud测试版:在线测验【允许学生查看结果】无法取消 2017-03-03 18:51:55 +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 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 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
daiao abcaf33a17 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-02 09:45:45 +08:00
huang 3582f70a6b 局部刷新测试 2017-03-01 16:53:01 +08:00