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

1351 Commits

Author SHA1 Message Date
cxt 841b180bea 班级资源的复制 2017-09-01 17:21:02 +08:00
cxt 1193c4b145 问卷的多行主观题迁移 2017-05-22 10:14:04 +08:00
cxt 552b571762 评分设置：提供两种机制由用户选择 2017-04-25 17:13:33 +08:00
cxt 97e9fb5444 班级统计列表数据不对 2017-04-19 17:35:03 +08:00
cxt 2a7a8fcdb4 班级作业的最终得分设置修改，由用户决定教师、助教和匿评的百分比计算 2017-03-30 15:31:07 +08:00
guange 606e431396 集成云片的短信发送功能 2017-03-12 16:53:47 +08:00
cxt 42ab249651 小铃铛的数字标识和事情情况有冲突 2017-03-09 10:58:46 +08:00
cxt 7de40ac88b 用户反馈（微信群）-评分作品被修改的提醒 2017-03-08 09:54:15 +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
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
huang 7763ce0d66 添加数据 2017-02-28 21:56:39 +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 524dd85409 班级新建作业，加入题库时，没有将附件一起加入 2017-02-28 10:11:58 +08:00
cxt e658a5426d 班级作业加入题库，题库中该作业的引用数是零 2017-02-24 17:18:32 +08:00
cxt 099fcde246 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2017-02-24 15:20:34 +08:00
cxt 0e40bf6daf 题库改版 2017-02-24 10:32:48 +08:00
Linda e1be2fda81 实训任务提交测评显示状态增加样式 2017-02-23 10:25:55 +08:00
daiao c115fad8a1 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 
Conflicts:
	db/schema.rb
 2017-02-20 14:09:59 +08:00
daiao 8039f89d92 实训项目的列表页面 2017-02-20 14:08:48 +08:00
Linda 72f085e13e Merge branch 'develop' into dev_raining 
Conflicts:
	db/migrate/20170219062646_add_positon_to_training_task.rb
	db/schema.rb
 2017-02-20 10:15:47 +08:00
huang 8d1987567e 实训项目相关模块相关api的开发 2017-02-19 17:49:58 +08:00
Linda 89dc320027 合作伙伴图片 及项目管理脚本录入界面 2017-02-19 15:28:57 +08:00
huang 82c6799953 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 
Conflicts:
	db/schema.rb
 2017-02-19 14:40:27 +08:00
huang df66e6d60c 启动任务相关接口 2017-02-19 14:39:15 +08:00
daiao 243062bee2 实训项目module中“实训项目”和"issue”不能同时选中，只选中一个 2017-02-19 10:50:08 +08:00
daiao 77f58d76a5 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop 
# Conflicts:
#	db/schema.rb
 2017-02-19 09:21:55 +08:00
cxt c3cd2ea153 班级的编程作业在新建和编辑时，需要增加输入输出样例的录入入口 2017-02-18 18:00:52 +08:00
huang a43c5cdb2f 启动实训Api等 2017-02-18 17:44:50 +08:00
huang d4eb4c0d56 实训任务模块 2017-02-17 19:29:00 +08:00
cxt c6ae00c6be 作品列表出现重复的数据 2017-02-17 18:54:15 +08:00
daiao 2c42a51195 平台管理员的首页报500 2017-02-17 09:00:35 +08:00
cxt c16f63a8b4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
	public/stylesheets/css/courses.css
 2017-02-15 11:15:09 +08:00
cxt 9be2cb56a1 Revert "Revert "测验头部和新建题目的改版"" 
This reverts commit 5a6e64beb2.

Conflicts:
	db/schema.rb
	public/stylesheets/css/courses.css
 2017-02-15 11:12:10 +08:00
cxt 6ccc53b089 班级统计中“活跃度”未完全统计 2017-02-10 17:04:10 +08:00
cxt e4ebd4dd2c 班级的统计模块显示“活跃度”、“英雄榜”、“项目活跃度”(单个作业的过滤未完成) 2017-02-10 14:35:43 +08:00
cxt 0b510df8b1 班级资源的延期发布精确到小时、班级、项目资源上传弹框改版 2017-02-08 13:54:04 +08:00
daiao b0d78003a6 迁移待审批高校消息的数据 2017-01-20 20:10:27 +08:00
cxt f47f9487dc 班级具体分班中导出成绩报500 2017-01-20 16:22:43 +08:00
guange 99741daef5 merge 2017-01-20 14:00:22 +08:00
guange d9ba7896df merge 2017-01-20 13:57:50 +08:00
guange 3c5b4b0086 . 2017-01-20 13:57:15 +08:00
cxt 65bfaedb3a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2017-01-20 13:56:34 +08:00
huang 74ed832b68 开源检索数据迁移 2017-01-20 10:25:15 +08:00
cxt ac80805932 班级统计功能（暂未完成） 2017-01-20 10:16:51 +08:00
huang 5a961c8ee7 解决blog删除、blog回复500问题 2017-01-19 17:26:26 +08:00
huang e1f107bf4f 课程提供开源检索配置功能 2017-01-19 15:51:53 +08:00
guange 3146342586 merge 2017-01-18 00:18:58 +08:00