jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,231 Commits 98 Branches 0 Tags 0 B
Commit Graph

205 Commits

Author SHA1 Message Date
cxt b8dc444cc7 普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表 
复制班级功能里，勾选“作业”，同上

对应方法：在作业的发布时间点（不用考虑作业是通过何种途径生成的），除了发布作业外，应该为该作业自动创建完整的作品列表（分组作业除外）
 2016-08-23 10:17:08 +08:00
guange e31fbe9b50 解决task报错，找不到uglifier的问题 2016-07-25 15:29:47 +08:00
huang 6fea64afe2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-22 10:35:44 +08:00
huang 537cc20e06 已repository_id为范围，version唯一性控制 2016-07-22 10:34:59 +08:00
huang 2381a78e1b 提交次数比较多的项目数据迁移 2016-07-22 10:23:12 +08:00
huang 4e4ff4958f 修改changeset触发事件 2016-07-21 17:19:45 +08:00
huang 466a25c121 提交后更新项目动态表update时间 2016-07-21 17:02:50 +08:00
huang 3fb5322b03 版本库历史数据处理 2016-07-21 16:08:13 +08:00
yuanke f0840d0f31 Merge branch 'develop' into weixin_guange 2016-07-21 14:29:04 +08:00
huang f979e80f24 Gitlab数据清理及迁移，主要是历史数据 2016-07-20 17:05:55 +08:00
huang 14e6db457b rake 2016-07-20 09:38:23 +08:00
huang 0c0dfbd093 changeset关联 2016-07-19 17:38:11 +08:00
huang cf04bb5ec6 迁移上线 2016-07-19 15:59:52 +08:00
huang 04fe06eff9 gitlab数据迁移 2016-07-19 09:39:47 +08:00
huang facf3ae8f8 提交次数写入动态中 2016-07-18 16:45:49 +08:00
yuanke f3d74fcd55 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:08:09 +08:00
guange 51692eadd6 改进上线流程 2016-07-17 00:49:35 +08:00
cxt c9e0143fe8 作业动态的时间 2016-07-15 19:36:46 +08:00
huang 87e1e0c4b1 rake任务，课程作业关联项目后获取最新版本库提交时间 2016-07-15 14:45:06 +08:00
cxt 66c40ba139 动态的更新时间 2016-07-12 09:41:00 +08:00
cxt 5d9bde3c95 课程发送资源到课程 2016-07-11 15:10:55 +08:00
huang 6b8b20e127 logger to puts 2016-07-08 19:45:15 +08:00
huang b0aa3c18c3 Merge branch 'rep_quality' into develop 2016-07-08 14:43:29 +08:00
huang 8916cc7730 update homeworkcommon time 2016-07-08 14:40:21 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
huang 922958e732 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-11 16:23:58 +08:00
cxt 644e097dc8 定时更新关联项目的作业更新时间 2016-05-09 16:16:03 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
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
huang ef74d8d956 添加任务--解决用户同步不成功的问题 2015-11-10 15:31:24 +08:00
huang 48547f3e11 1/添加members迁移 
2、过滤掉版本库identifier重复值的版本库
3、添加puts打印
 2015-11-06 17:47:56 +08:00
huang 71728a15e4 迁移类型为Git 2015-11-06 14:39:15 +08:00
huang 7e5585bdd2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-04 16:41:18 +08:00
huang 58b7250d39 同步项目 
修改同步参数问题
 2015-11-04 16:19:25 +08:00
huang a996e658a9 单个版本库自动同步任务 2015-11-04 14:50:39 +08:00
cxt 958532bedc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-04 11:16:25 +08:00
cxt ee7b21de72 禁用匿评功能 2015-11-04 10:54:09 +08:00
huang 6e7950983b 1、数据任务迁移 
2、添加commits总数统计
 2015-11-03 17:19:19 +08:00
huang 1c45afac89 增加提示 
修改链接参数
 2015-11-02 19:14:55 +08:00
huang f4b12d191a 更新repository的type 2015-11-02 17:50:44 +08:00
huang 36d61cd82f 添加历史记录迁移 2015-11-02 17:36:45 +08:00
cxt f5aaf7ac58 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-10-30 13:59:33 +08:00
cxt 6dcc97d5d1 添加作业的发布功能 2015-10-30 13:58:54 +08:00
huang bf06a6cafd 解决数据同步问题（历史邮件通知validate问题） 2015-10-29 12:33:22 +08:00
guange 07084a94c5 . 2015-10-18 13:50:59 +08:00
guange b80a0d6366 . 2015-10-18 13:25:10 +08:00
guange 3a21e9f2b0 修复重构错误 2015-10-18 13:16:58 +08:00
guange 9e8e77f3e1 方法重构 2015-10-16 16:57:45 +08:00
huang 73898953d9 project表添加字段，记录project对应gitlba中project id 2015-10-13 10:58:22 +08:00
huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange 
Conflicts:
	Gemfile
	app/models/user.rb
	db/schema.rb
	lib/trustie.rb

解决冲突
 2015-10-10 16:09:05 +08:00