Commit Graph

18896 Commits

Author SHA1 Message Date
cxt c407f81dfa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-06 11:20:03 +08:00
cxt dd0cb87d4f 班级讨论区的助教没有帖子置顶功能 2017-03-06 11:19:51 +08:00
cxt 0141735db4 问吧帖子回复的时候,二级回复的Url没有自动调整为超链接 2017-03-06 11:03:33 +08:00
陈晓婷 ddbef73270 Merge branch 'develop' into 'develop'
bug修复



See merge request !163
2017-03-03 19:23:00 +08:00
cxt a92bb253aa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-03 19:21:34 +08:00
cxt c6799aae67 Ucloud测试版:答题之后查看答题情况界面中,问答题区域多了一根分隔线 2017-03-03 19:00:43 +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 181ccbf287 竞赛作品编辑时点击取消,返回的是错误页面 2017-03-03 16:25:13 +08:00
cxt bf85e593a2 加入邀请码已停用的竞赛,提示信息内容错误 2017-03-03 16:17:02 +08:00
陈晓婷 70a9800c7e Merge branch 'develop' into 'develop'
本周上线任务



See merge request !162
2017-03-03 15:40:13 +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
陈晓婷 6c8263dcf6 Merge branch 'develop' into 'develop'
周五上线内容



See merge request !161
2017-03-03 15:37:22 +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
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 5b995198ee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-02 10:24:39 +08:00
daiao bf379ff716 项目的PullRequest的样式有问题 2017-03-02 10:23:55 +08:00
黄井泉 f4867bda70 Merge branch 'develop' into 'develop'
周四上线内容



See merge request !160
2017-03-02 10:22:35 +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