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

9133 Commits

Author SHA1 Message Date
lizanle 7cb39d1754 全站搜索 2015-11-27 10:40:58 +08:00
cxt 1f2675020b 学生答题未完成时可保存试卷 2015-11-27 10:15:25 +08:00
houxiang ee746b2d64 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 
need it
 2015-11-27 10:12:00 +08:00
houxiang c6b5abba4e hide the the count of project'repo 2015-11-27 10:10:59 +08:00
lizanle ee47187a61 全站搜索 2015-11-27 09:52:51 +08:00
ouyangxuhua 58365e8892 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
2.组织增加项目功能
 2015-11-27 09:50:17 +08:00
huang 8c83bbfff3 课程英雄榜数据 2015-11-27 00:48:08 +08:00
huang 061a1f602a 效果实现 2015-11-26 21:17:04 +08:00
huang aca7684414 课程英雄榜 
各模块动作 触发加分
 2015-11-26 18:22:03 +08:00
cxt cc0ff6bbc0 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-26 17:22:46 +08:00
cxt dec5980443 截止时间一到立即提交试卷 2015-11-26 17:20:17 +08:00
cxt f8621cac76 未设置考试时长时，只要还未到截止时间就可以一直提交试卷。 2015-11-26 16:57:51 +08:00
lizanle dcd441a9db 全站搜索 2015-11-26 16:43:10 +08:00
ouyangxuhua 9c3aed8028 增加组织加入课程功能 2015-11-26 16:29:50 +08:00
cxt ed9cef486f 测验列表页面的按钮调整 2015-11-26 15:21:46 +08:00
cxt b690fa0b05 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-26 14:48:01 +08:00
cxt b602e1c85d 学生答题页面显示试卷截止时间 2015-11-26 14:47:52 +08:00
Tim 5bdcdc607f 测验列表格式更改 2015-11-26 14:45:35 +08:00
cxt f1bb1bb8c2 测验列表的创建时间改成截止时间，每个测验名字前增加序号，显示发布状态 2015-11-26 14:36:19 +08:00
cxt cbdc6bb889 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-26 11:22:52 +08:00
cxt 6b72b4bb17 非课程参与人员无法查看私有课程的测验列表 2015-11-26 11:22:42 +08:00
Tim 09e0e5e93d 单选多选还原 2015-11-26 11:10:17 +08:00
Tim 2a73751fd9 多选题样式调整 2015-11-26 10:56:24 +08:00
Tim 2b6cae5418 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/views/exercise/_show_MC.html.erb
 2015-11-26 10:29:21 +08:00
Tim a0c73a5a54 单选题样式调整 2015-11-26 10:27:32 +08:00
cxt 6513c0afee 测验题目的删除按钮增加title 2015-11-26 10:11:54 +08:00
cxt 6f4b6a6b67 填空题的候选答案不能为空，选择题和填空题至少得有一个选项或一个候选答案 2015-11-26 10:03:12 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
cxt 2cd1c07028 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-25 16:05:13 +08:00
cxt c7cf34500c 老师若未设置测验的发布时间则提交后立即发布 2015-11-25 16:05:02 +08:00
huang c8b1cae947 建立贡献榜表及相关关联 
部分页面
按总分排序（英雄榜）
部分页面（未完成）
 2015-11-25 15:16:33 +08:00
Tim bd7ee66e77 新建测验样式调整 2015-11-25 15:02:32 +08:00
cxt 7fb78e4816 新建测验标题等内容时 点击取消应还原编辑框中的内容 2015-11-25 10:38:43 +08:00
cxt 3e0609afe3 测验时长和题目分数增加数字验证 2015-11-25 10:24:46 +08:00
cxt 1ae514ca48 测验的发布日期和测验时长做成可选的 2015-11-25 09:38:13 +08:00
ouyangxuhua 2dc31637d8 项目和课程中加入组织时，如果已经加入了某组织，就不要重复加入。 2015-11-24 17:29:58 +08:00
huang 85515befc4 实现工具栏数字大于0显示，小于0隐藏 2015-11-24 17:29:57 +08:00
cxt 0e7cf4b122 学生作品页面的批次列表只显示已发布的作业 2015-11-24 16:21:25 +08:00
cxt e89cb99743 添加学生测验结果页面的批次链接 2015-11-24 16:20:29 +08:00
cxt ec00b86c15 学生多次新建作品时提醒学生不能重复提交 2015-11-24 15:17:47 +08:00
Tim 64d4789150 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/user_organizations.html.erb
 2015-11-24 15:06:19 +08:00
Tim 269d2f992e 组织列表搜索框调整后注释 2015-11-24 15:02:25 +08:00
ouyangxuhua a3146c66ae Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-24 12:51:12 +08:00
ouyangxuhua ccfbc1e0bd 1.组织翻页增加type参数； 
2.删除组织表中冗余的项目动态和课程动态。
 2015-11-24 12:50:43 +08:00
cxt b46561dac1 提交作业时若作品名称和作品描述为空，则不弹出作品校验弹框 2015-11-24 10:34:23 +08:00
houxiang ad891aea39 分支合并 2015-11-24 10:19:20 +08:00
houxiang 6b481c8961 mute the fork function by hx 2015-11-24 10:12:21 +08:00
huang 55ff5f4931 Merge branch 'develop' into gitlab_guange 
Conflicts:
	app/views/projects/settings/_join_org.html.erb
	db/schema.rb
处理冲突
 2015-11-24 09:55:26 +08:00
huang 3af96c96e7 finalize the commit_counts problems by hx 2015-11-23 21:07:43 +08:00
houxiang c3bbf3490f modify show 2015-11-23 19:50:12 +08:00
houxiang b3d36705d2 modify the commit_count by hx 2015-11-23 19:48:20 +08:00
ouyangxuhua 68bb142278 解决组织bug:动态过滤，点击“展开更多”，有通知等其他动态 2015-11-23 17:29:55 +08:00
huang 85a219f7e9 项目动态\清除 2015-11-23 17:16:05 +08:00
huang 39455f9f8a 作业重复提交问题 2015-11-23 17:08:17 +08:00
houxiang 56519389d2 add binarysearch for commit_count by hx 2015-11-23 16:51:12 +08:00
ouyangxuhua 71e98c873d 组织回复框中，默认图片颜色为灰色，当焦点放在输入框时，图片颜色变亮。 2015-11-23 16:40:21 +08:00
ouyangxuhua 1914639bc3 成功添加某成员后，在搜索框中输入的该成员关键字就要自动清空 2015-11-23 10:17:20 +08:00
ouyangxuhua 65548cd8c3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-23 09:32:21 +08:00
ouyangxuhua d2a87127da 我的组织搜索功能显示 2015-11-23 09:32:03 +08:00
huang 83c7e981af Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 21:50:35 +08:00
cxt dbe236032b 新建题目时必须先保存标题 2015-11-20 21:50:27 +08:00
huang 3083f683b9 修改删除的时候顺序乱的问题 
添加相应的参数
 2015-11-20 21:14:09 +08:00
huang 550d056630 删除某个题目后顺序排列 2015-11-20 20:55:37 +08:00
cxt 89f8f5f383 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 20:44:40 +08:00
cxt b10fbcde8c 取消发布和发布测验 2015-11-20 20:44:27 +08:00
huang dd148fb7c5 Merge branch 'szzh' into sw_new_course 
Conflicts:
	db/schema.rb
 2015-11-20 20:25:17 +08:00
cxt b9460efa08 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 20:23:21 +08:00
cxt cc19c345e1 提交 2015-11-20 20:23:02 +08:00
huang 2435f06f44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 20:03:11 +08:00
huang 8b29002a0f 修改得分规则 2015-11-20 20:02:57 +08:00
cxt c36ec99ff6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 19:59:17 +08:00
cxt 9ca336a70a 发布和取消发布 2015-11-20 19:59:05 +08:00
huang c0dfc17b19 修改状态更新 2015-11-20 19:35:32 +08:00
huang da55b00da7 删除插入问题 2015-11-20 19:05:39 +08:00
huang a3122a9a2c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:39:44 +08:00
huang aa36c927d3 0 2015-11-20 18:39:35 +08:00
cxt c07e2fe2d2 发布试卷 2015-11-20 18:38:50 +08:00
cxt 98297da226 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:29:36 +08:00
cxt c9ba57f64b 去掉关闭、导入等功能 2015-11-20 18:29:26 +08:00
huang bb726e3475 提交答案验证 2015-11-20 18:21:31 +08:00
huang d1e0e0fd30 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:02:04 +08:00
huang 97485ca221 修改show逻辑 
提交问卷后学生页面显示
 2015-11-20 18:01:50 +08:00
cxt da34083a2a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:00:22 +08:00
cxt 332ace0f34 列表 2015-11-20 18:00:11 +08:00
ouyangxuhua 6068867670 项目动态和组织动态删除后，删除相应的组织动态 2015-11-20 17:42:43 +08:00
huang 431d1d886c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 17:29:33 +08:00
huang 8728557813 老师和学生统计数目区分 2015-11-20 17:29:15 +08:00
cxt d4d2adddb2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/controllers/exercise_controller.rb
 2015-11-20 17:26:49 +08:00
cxt eee63b2495 提交前验证数据不为空 2015-11-20 17:25:03 +08:00
huang ed86e3ee5a 三种类型题目计算总分 2015-11-20 17:18:57 +08:00
ouyangxuhua a57260aae6 修改当“Message”回复对应的组织动态 2015-11-20 16:41:15 +08:00
ouyangxuhua 5cfc8c2f8d 编辑文章后，或者回复文章后，更新组织动态的更新时间 2015-11-20 16:16:46 +08:00
huang 74f6cb2e64 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 15:14:07 +08:00
huang db46e5e4af 问卷得分统计 2015-11-20 15:13:53 +08:00
cxt b0730dfb81 测验 2015-11-20 15:12:07 +08:00
ouyangxuhua d77d4a421b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-20 14:51:16 +08:00
ouyangxuhua dcbdea9bb5 1.修复文章详细列表删除后，页面报错的问题； 
2.文章详情页面中，文章回复显示中回复人丢失问题修复
 2015-11-20 14:50:48 +08:00
cxt 9f6fc79df0 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 14:34:27 +08:00
cxt 863d7ed4b5 单选和填空 2015-11-20 14:34:09 +08:00
Tim 1aa7599771 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-20 14:31:10 +08:00