Commit Graph

4894 Commits

Author SHA1 Message Date
huang a206a471af Merge branch 'dev_newproject' into dev_newrep
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/base_projects.html.erb
2016-10-11 10:58:37 +08:00
huang e9a1582b71 项目添加收藏功能 2016-10-11 09:30:45 +08:00
huang 17743457e1 项目menu导航 2016-10-10 10:41:41 +08:00
huang acb6fcfc81 Merge branch 'develop' into dev_newrep 2016-10-09 15:36:49 +08:00
huang 2e94fbee81 项目、课程、组织资源描述过长不能提交的问题 2016-10-09 15:09:18 +08:00
cxt b123192286 分组作业的匿评分配 2016-10-09 09:48:55 +08:00
huang 45d8e64840 修改gitlab tree返回类型(lastrev) 2016-10-09 09:30:20 +08:00
cxt f0e334d33d 分组作业的迟交扣分和缺评扣分 2016-10-09 09:16:05 +08:00
cxt 12d70c6999 分组作业编辑时“基于项目实施”的设置不起作用 2016-10-08 18:06:09 +08:00
huang 937f93e756 Merge branch 'develop' into dev_newrep 2016-10-08 16:05:47 +08:00
huang 54b66b86dc 0 2016-10-08 15:58:05 +08:00
huang b7b94fb050 版本库控制器代码优化一 2016-10-08 14:57:55 +08:00
cxt 6ef45a094f Merge branch 'cxt_course' into develop 2016-10-08 14:24:47 +08:00
cxt 7f3bb0be63 教师团队中上移、下移功能的完善 2016-10-08 13:54:35 +08:00
huang 137d62ae5d Merge branch 'rep_quality' into dev_newrep 2016-10-08 11:14:36 +08:00
huang 351ca6d074 Merge branch 'rep_quality' into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
2016-10-08 10:41:05 +08:00
cxt 3b8dded2bc 新建课程的教师团队为空 2016-10-08 10:21:33 +08:00
huang 0906da5132 版本库代码简化 2016-10-08 10:10:59 +08:00
cxt ceb0913568 学生列表报500 2016-09-30 18:35:08 +08:00
cxt e5204112d0 教师列表报500 2016-09-30 17:19:57 +08:00
cxt b5782bae39 班级左侧导航的“分班” 2016-09-30 17:12:40 +08:00
cxt 23f1c3175c 学生列表的导出 2016-09-30 17:04:19 +08:00
cxt db9d4900ac Merge branch 'cxt_course' into develop 2016-09-30 16:48:05 +08:00
cxt b25e4ed5d7 新闻、通知的回复分页 2016-09-30 16:09:10 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt 5d0e3889df 班级、项目、组织帖子详情回复的分页 2016-09-30 14:26:16 +08:00
cxt a9a53caa13 学生提交作品后,跳转至“作品列表”,而不是“作业信息” 2016-09-30 10:29:42 +08:00
cxt f6296377bd 班级内的分班 2016-09-29 11:29:37 +08:00
daiao fdca4ea968 项目与班级资源库导入资源重名时导入异常 2016-09-28 16:52:02 +08:00
huang 25b2602d3e 版本库路径唯一 2016-09-28 16:51:25 +08:00
huang bd383f5010 项目历史版本库提示删除一级setting中控制权限判断 2016-09-28 16:04:53 +08:00
huang 6ece9c0463 性能优化 2016-09-28 10:40:56 +08:00
cxt 03fac1900e 分班 2016-09-28 10:00:01 +08:00
huang e49f9b49b2 Merge branch 'rep_quality' into develop 2016-09-27 19:48:10 +08:00
daiao 7c76584e14 issue功能优化 2016-09-27 19:44:24 +08:00
huang c76cfad51a Merge branch 'rep_quality' into develop 2016-09-27 18:03:02 +08:00
huang b96ab3676c issue过滤条件 2016-09-27 18:01:26 +08:00
yuanke 89d91f69c2 Merge branch 'weixin_guange' into develop 2016-09-27 16:20:07 +08:00
huang 70d58ea28e 版本库导出代码统计功能 2016-09-27 15:10:52 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/project.css
2016-09-26 22:21:45 +08:00
huang 528aeaff89 Merge branch 'rep_quality' into develop 2016-09-26 22:20:08 +08:00
huang 5531a236fa 统计数字实时刷新 2016-09-26 21:02:12 +08:00
daiao bfa1f32214 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-26 16:22:24 +08:00
daiao 0ec1ecc2bf issue功能优化 2016-09-26 16:22:14 +08:00
huang 3ace67f706 版本库库代码统计导出excel功能 2016-09-26 16:17:21 +08:00
cxt 4db59ea0d3 我的题库 切换两次后作业丢失链接 2016-09-26 15:07:25 +08:00
yuanke 2ac827c66f 修改代码测试出错时的日志打印 2016-09-26 09:44:47 +08:00
cxt e1ce5d2305 教师团队的删除判断、“增加教师”链接跳转时展开添加成员 2016-09-23 18:34:03 +08:00
huang 6d419efaec issue列表修改 2016-09-23 17:47:53 +08:00
cxt 70042fe91f 帖子详情页面的优化 2016-09-23 16:44:49 +08:00