Commit Graph

12589 Commits

Author SHA1 Message Date
linchun df4ad9f597 完成管理员界面最近登录列表单位信息 2016-03-15 09:31:35 +08:00
huang a1cae3f592 admin教师单位获取 2016-03-14 17:50:07 +08:00
linchun a1bef60bb5 Merge branch 'linchun' of https://git.trustie.net/jacknudt/trustieforge into linchun 2016-03-14 17:41:14 +08:00
linchun 96f65f338c 用户列表添加单位 2016-03-14 17:40:49 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun
Conflicts:
	db/schema.rb
2016-03-11 17:25:30 +08:00
huang 97a7694778 访问统计数--views 2016-03-11 15:58:16 +08:00
Tim 45f1cfa477 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-11 15:51:59 +08:00
Tim 051c9dfd0c Merge branch 'cxt_course' into develop 2016-03-11 15:51:45 +08:00
huang 8079254089 首页增加访问统计 2016-03-11 15:51:45 +08:00
Tim 53c281103c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-11 15:49:54 +08:00
Tim de3a4718ab 个人,课程,项目,组织访问量添加 2016-03-11 15:49:24 +08:00
huang c18634be86 课程通知。新闻代码优化 2016-03-11 15:21:40 +08:00
cxt a7b9d8424a 只有全部列表中的学生可编辑分班 2016-03-10 17:41:53 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
huang 5818860a4d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-10 16:44:05 +08:00
huang 08cb7b642c 附件上传样式 2016-03-10 16:43:25 +08:00
cxt fa3fd56686 题库发送课程的弹框搜索不能用 2016-03-10 15:48:39 +08:00
cxt c255325300 添加分班 2016-03-10 15:47:03 +08:00
huang 55d14ecc65 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-10 15:00:12 +08:00
cxt e7c0ff7226 Merge branch 'develop' into cxt_course 2016-03-10 14:55:04 +08:00
cxt 0fb808e2fd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-10 14:53:23 +08:00
cxt 37c1d435f3 Merge branch 'szzh' into develop 2016-03-10 14:52:37 +08:00
cxt 9fd0951ec3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-03-10 14:52:23 +08:00
cxt 2c579c2979 Merge branch 'cxt_course' into szzh 2016-03-10 14:52:15 +08:00
cxt cd1409f950 还原学生分班 2016-03-10 14:51:31 +08:00
cxt 8a4175dc02 点击学生作品列表中的编程作品,代码会跳到上一个作品的详情 2016-03-10 11:40:56 +08:00
cxt f8f36f9f29 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-10 11:15:43 +08:00
cxt cc441826ee 测试代码即提交代码 系统得分为当次的测试得分 2016-03-10 11:15:37 +08:00
Tim 5d3d73a783 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-10 10:02:47 +08:00
Tim 61ce439e74 添加老师对学生的分班操作 2016-03-10 10:02:24 +08:00
cxt 5b4ff5ec8a 学生列表中的作业积分为负分 2016-03-10 09:22:49 +08:00
huang a6c7766b00 修复部分用户不能删除的问题 2016-03-09 18:06:26 +08:00
huang 3d2ba83c36 @消息问题修复 2016-03-09 17:22:16 +08:00
huang 5a4f422b1c 消息分页问题 2016-03-09 16:44:11 +08:00
huang 53e164048d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-09 15:29:06 +08:00
huang 0dbcf30bdc Merge branch 'szzh' into develop 2016-03-09 15:28:59 +08:00
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh 2016-03-09 15:28:28 +08:00
huang d3fd445108 数据迁移 2016-03-09 15:27:50 +08:00
cxt af88575728 Merge branch 'cxt_course' into szzh 2016-03-09 15:25:59 +08:00
huang b4800585e7 解决消息 信息500问题 2016-03-09 15:24:02 +08:00
huang 84d7049add fork弹出新页面,解决间接性500问题 2016-03-09 13:17:37 +08:00
huang 99be187d54 版本库 无法预览的文件提供直接下载功能 2016-03-09 11:30:28 +08:00
cxt db1f31724a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-09 11:15:48 +08:00
cxt d3489ec5cb 作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间 2016-03-09 11:15:43 +08:00
Tim d6d8e231e6 课程推荐在ie中显示bug 2016-03-09 09:46:07 +08:00
cxt 9456faa33d Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-09 09:21:00 +08:00
cxt 1cccf79bd8 课程资源库菜单中的删除资源无法点击 2016-03-09 09:20:53 +08:00
huang f469e51202 课程模块/通知、作业、留言、发帖,删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
huang f022950408 Merge branch 'develop' into hjq_new_course 2016-03-08 16:17:18 +08:00
Tim 141c0be24f 上传资源弹窗样式调整 2016-03-08 15:50:01 +08:00