Commit Graph

126 Commits

Author SHA1 Message Date
huang df1c70880a Merge branch 'cxt_course' into develop
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
2016-05-06 12:22:43 +08:00
cxt 0fafbffa49 项目的更新加到作业的最后更新时间中 2016-05-06 08:52:54 +08:00
huang cb2033c80f 去掉rake中输出 2016-04-21 16:20:29 +08:00
huang 81f8559c48 gitlab版本库成员同步任务 2016-04-21 16:04:00 +08:00
huang 41aa81f966 rake 任务:同步文件数 2016-04-18 14:44:29 +08:00
cxt 6b4be999ee 资源的定时发布 2016-02-22 18:35:04 +08:00
guange 1f7bcbed20 处理导入题库标题中的换行字符 2016-02-02 21:28:52 +08:00
guange eb3644a197 将一堆的rake命令变为一条 2016-02-02 19:16:15 +08:00
guange 609d98f8a3 执行task时没有代入环境变量 2016-02-02 16:33:08 +08:00
guange ed2a3c976d 执行task时没有代入环境变量 2016-02-02 16:25:26 +08:00
huang 655cc0d2db issue截止时间邮件通知 2016-01-22 20:26:44 +08:00
huang 59aa1e9c6f issue截止修改 2016-01-22 09:55:58 +08:00
huang 524e152b24 Issue截止时间到了邮件提醒 2016-01-21 11:19:08 +08:00
huang 52adcb378d 注释任务 2015-12-18 21:29:25 +08:00
huang dae6e68623 renwu 2015-12-18 20:46:17 +08:00
huang 747493993b 上线测试 2015-12-18 19:57:08 +08:00
huang 88cdb5a3ed Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/controllers/repositories_controller.rb
解决冲突
2015-12-18 17:08:26 +08:00
cxt b65e84d166 未答测验的学生在测验截止时间到了后算作零分 2015-12-18 12:47:34 +08:00
houxiang fc2eae4c62 add something by hx 2015-12-17 20:56:30 +08:00
houxiang 0324282641 查询每个项目的各个成员中的提交贡献次数 2015-12-16 14:30:46 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2015-12-11 15:00:35 +08:00
cxt 27ed6df9d6 Merge branch 'szzh' into develop 2015-12-11 14:59:52 +08:00
cxt a3715051b1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:59:13 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
huang f2c1595d0d 1、同步没成功检测程序
2、注册验证修改
2015-12-09 16:57:12 +08:00
huang da04607859 Merge branch 'gitlab_guange' of http://git.trustie.net/jacknudt/trustieforge into gitlab_guange 2015-12-08 16:53:56 +08:00
lizanle ef2ef7111c 添加对帖子的全文搜索 2015-12-07 14:31:05 +08:00
lizanle dbfc4969e0 测验消息bug 2015-12-04 15:36:19 +08:00
lizanle e2f5dcc3f9 当天截止的测验需要发布截止消息 2015-12-04 13:39:17 +08:00
lizanle 06122dab1d 当天截止的测验需要发布截止消息 2015-12-04 11:24:24 +08:00
lizanle 03588ca88d 发布测验的时候发布消息 2015-12-04 11:21:41 +08:00
lizanle e3c594a7ca Merge branch 'develop' into dev_zanle 2015-12-04 10:59:14 +08:00
lizanle 6553559929 发送消息 2015-12-04 10:56:16 +08:00
cxt 838140ada8 在线测验的自动发布和截止 2015-12-03 19:08:15 +08:00
cxt 259cb67c58 rake命令的消息通知 2015-12-01 09:22:01 +08:00
cxt b16acda21e 匿评结束消息暂时不发送 2015-11-30 17:22:03 +08:00
cxt fee438cc0b Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-30 16:27:39 +08:00
cxt ebeaac5798 作业匿评的结束状态未更新 2015-11-30 16:27:26 +08:00
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
合并
2015-11-30 14:35:37 +08:00
cxt 7f4e47eadc 删除匿评评分数据 2015-11-30 13:12:35 +08:00
Gan Yi.ang 3516cde555 sync_gitlab_user加验证加日志 2015-11-28 10:25:53 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle
Conflicts:
	app/models/attachment.rb
	db/schema.rb
2015-11-27 18:47:02 +08:00
huang 2749066908 单个项目同步输出 2015-11-27 18:43:22 +08:00
Gan Yi.ang e9caf0980a 同步用户sync_gitlab_user,加异常处理 2015-11-27 17:57:43 +08:00
lizanle 3d9f632105 全站搜索 2015-11-27 14:42:25 +08:00
lizanle 7cb39d1754 全站搜索 2015-11-27 10:40:58 +08:00
huang 55d3b8abb3 去掉同步过程中输出 2015-11-16 17:19:53 +08:00
huang ca8b62b8bd Merge branch 'szzh' into gitlab_guange 2015-11-14 15:22:05 +08:00
cxt 3f60893591 禁用匿评的作业在截止时作业状态变为3 2015-11-12 14:53:12 +08:00
huang cc0afa7d9b 添加删除迁移版本库 2015-11-11 12:43:59 +08:00