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

10318 Commits

Author SHA1 Message Date
huang 627580a9ac 标签问题（未完） 2016-03-10 16:25:39 +08:00
cxt fa3fd56686 题库发送课程的弹框搜索不能用 2016-03-10 15:48:39 +08:00
cxt c255325300 添加分班 2016-03-10 15:47:03 +08:00
yuanke 7f7979e955 修改回复时可多次点击发送按钮的问题。 2016-03-10 15:12:16 +08:00
huang 281d31980d Merge branch 'develop' into hjq_new_course 2016-03-10 15:02:34 +08:00
cxt 0fb808e2fd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-10 14:53:23 +08:00
huang c947121e2b 消息不显示问题（未完） 2016-03-10 14:52:49 +08:00
cxt 9fd0951ec3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-03-10 14:52:23 +08:00
cxt cd1409f950 还原学生分班 2016-03-10 14:51:31 +08:00
cxt 8a4175dc02 点击学生作品列表中的编程作品，代码会跳到上一个作品的详情 2016-03-10 11:40:56 +08:00
cxt f8f36f9f29 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-10 11:15:43 +08:00
cxt cc441826ee 测试代码即提交代码 系统得分为当次的测试得分 2016-03-10 11:15:37 +08:00
Tim 5d3d73a783 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-10 10:02:47 +08:00
Tim 61ce439e74 添加老师对学生的分班操作 2016-03-10 10:02:24 +08:00
cxt 5b4ff5ec8a 学生列表中的作业积分为负分 2016-03-10 09:22:49 +08:00
huang 3d2ba83c36 @消息问题修复 2016-03-09 17:22:16 +08:00
huang 5a4f422b1c 消息分页问题 2016-03-09 16:44:11 +08:00
huang 53e164048d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-09 15:29:06 +08:00
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh 2016-03-09 15:28:28 +08:00
huang b4800585e7 解决消息 信息500问题 2016-03-09 15:24:02 +08:00
huang 84d7049add fork弹出新页面，解决间接性500问题 2016-03-09 13:17:37 +08:00
huang 99be187d54 版本库 无法预览的文件提供直接下载功能 2016-03-09 11:30:28 +08:00
cxt db1f31724a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-09 11:15:48 +08:00
cxt d3489ec5cb 作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间 2016-03-09 11:15:43 +08:00
Tim d6d8e231e6 课程推荐在ie中显示bug 2016-03-09 09:46:07 +08:00
huang f469e51202 课程模块/通知、作业、留言、发帖，删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
huang f022950408 Merge branch 'develop' into hjq_new_course 2016-03-08 16:17:18 +08:00
Tim 141c0be24f 上传资源弹窗样式调整 2016-03-08 15:50:01 +08:00
ouyangxuhua 6e21229b4c 组织用户链接 2016-03-08 15:22:56 +08:00
ouyangxuhua 4442d286ce 组织下的用户连接改成https://www.……形式 2016-03-08 15:20:38 +08:00
linchun 3e70db4e82 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-08 11:29:58 +08:00
huang 2fdddc6488 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-08 11:27:22 +08:00
huang ec4a3b321c 更新历史版本，下载次数，引用次数不清零 2016-03-08 11:26:55 +08:00
linchun 3c66a29767 完善课程资源列表，完成项目资源列表 2016-03-08 11:01:08 +08:00
cxt ca094a13b5 优秀作品排行中，不允许访问的，就取消链接。老师设置了完全公开的作品，就有链接 2016-03-08 10:16:55 +08:00
cxt f0e3fe8ff7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-08 09:13:27 +08:00
cxt 2ee93f9f86 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-08 09:12:50 +08:00
cxt 3424be695e 题库：发送的弹框中，不要出现已经删除的课程 2016-03-08 09:12:37 +08:00
ouyangxuhua c3eb8e05cd 组织的私有资源，数量一致 2016-03-07 18:12:40 +08:00
ouyangxuhua d70df6a89d 公开组织的资源，非成员不能看到私有资源 2016-03-07 17:41:43 +08:00
ouyangxuhua 699e1f41a7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-07 17:18:39 +08:00
ouyangxuhua ce187b4212 组织资源下载权限控制 2016-03-07 17:18:01 +08:00
cxt 64b6af6177 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-07 17:02:03 +08:00
cxt 91d000c8f3 编程作业：编程测试集的弹框中，多行却只显示一行 2016-03-07 17:01:10 +08:00
Tim 56372fbdd5 积分规则显示样式调整 2016-03-07 16:50:30 +08:00
linchun b7f4b584f2 完成管理员界面课程资源列表 2016-03-07 16:46:02 +08:00
ouyangxuhua 2ea553e988 Merge branch 'ouyangxuhua' into develop 2016-03-07 16:15:13 +08:00
ouyangxuhua 0df34dd3ee 组织资源栏目，过滤条件“其他”内容 2016-03-07 16:14:44 +08:00
cxt f8ce6d48d3 模拟答题的返回按钮应该回到课程作业列表 2016-03-07 14:31:58 +08:00
cxt e30c26aa09 课程报500 2016-03-07 13:56:28 +08:00
ouyangxuhua a0363b5511 组织资源发送后，发送次数动态增加 2016-03-07 12:57:24 +08:00
ouyangxuhua 319f286a65 解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适 2016-03-07 12:19:48 +08:00
cxt fcae91ecc1 “课程通知”改为“通知” 2016-03-07 11:27:47 +08:00
cxt cff5e9171f 导入作业后页面不应跳转到被导入的作业页面 2016-03-07 11:21:58 +08:00
ouyangxuhua 984cd76b7f Merge branch 'develop' into ouyangxuhua 2016-03-07 10:30:09 +08:00
ouyangxuhua b77b63bbf1 解决私有组织栏目通过url能访问的问题 2016-03-07 10:29:37 +08:00
huang d6dedf03cb 去掉puts注释 2016-03-06 12:18:57 +08:00
huang d30e73795d 积分规则 2016-03-06 12:15:57 +08:00
huang 4f2937e1a2 英雄榜 2016-03-05 10:38:21 +08:00
huang a079a61c82 回复数 2016-03-05 04:29:10 +08:00
huang d54609075b 区分新闻和新闻回复得分 2016-03-05 04:01:10 +08:00
huang 6ceb4f4549 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/models/course_contributor_score.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_homework_search_input.html.erb
	app/views/users/_show_user_homeworks.html.erb
	app/views/users/_user_homework_detail.html.erb
	app/views/users/_user_homework_form.html.erb
	app/views/users/user_homework_type.js.erb
	app/views/users/user_homeworks.html.erb
	app/views/users/user_homeworks.js.erb
 2016-03-05 03:17:47 +08:00
huang bafa151c0d 0 2016-03-05 03:16:04 +08:00
huang 3f56fa3405 0 2016-03-05 03:14:57 +08:00
huang f381784a3c 数据迁移 2016-03-05 03:13:58 +08:00
huang 814e766577 课程过滤 2016-03-04 21:22:47 +08:00
huang e4d669251f 英雄榜得分 2016-03-04 21:13:24 +08:00
huang 4cf80fe441 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 21:11:07 +08:00
huang 6ce947667d 课程英雄榜提示 2016-03-04 21:10:45 +08:00
cxt 782bbc775b 公共资源库的统计 2016-03-04 21:04:21 +08:00
huang de1c2e18c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 18:37:46 +08:00
huang 38fca02193 注释搜索 2016-03-04 18:36:42 +08:00
huang ae40a4ea61 公共资源相关功能 2016-03-04 18:22:22 +08:00
cxt 3deaa492b2 编辑作业时作业描述被解析了 2016-03-04 18:11:23 +08:00
cxt 4f3055c990 讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。 2016-03-04 17:11:52 +08:00
cxt fd8b40a36e 对于编程作业，系统评分的前几名能否也显示出来 2016-03-04 16:53:36 +08:00
huang 91b8a81b9d 去掉全站搜索 2016-03-04 16:10:41 +08:00
huang bbbf13084e 修改搜索功能，页面跳转 2016-03-04 16:05:58 +08:00
cxt 947e6ea469 作业--“禁用匿评”处增加提示语：匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品。 2016-03-04 16:00:20 +08:00
cxt ffac8164f1 管理员的课程和项目列表，按照时间倒排 2016-03-04 15:55:45 +08:00
linchun bb8a6af13e admin界面添加精品课程页面，目前该页面中的精品课程是固定的 2016-03-04 15:31:40 +08:00
cxt a5cb3d5e6a 新建作品时的输入框改为“请输入作品名称”、“请输入作品描述” 2016-03-04 15:14:38 +08:00
cxt d2920c64ea 题库作业发送到课程后增加提示 2016-03-04 15:12:03 +08:00
huang dfddb30ca3 附件引用 2016-03-04 14:21:39 +08:00
cxt 6ca702eb2c 题库发送的课程列表中不包含当前作业所在的课程 2016-03-04 13:18:43 +08:00
cxt 8aff404f0c 题库过滤作业的搜索 2016-03-04 11:37:14 +08:00
huang 9beaa62d6d 课程活跃度 2016-03-04 11:36:34 +08:00
huang 50011985a9 课程资源库添加资源描述 2016-03-04 11:19:07 +08:00
cxt b333c40ce0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/public.css
 2016-03-04 11:11:25 +08:00
cxt e2ff348075 题库的作业过滤 2016-03-04 11:07:53 +08:00
cxt 0cd536fcc9 题库增加发布者姓名搜索 2016-03-04 10:34:04 +08:00
huang 596d4e17e9 解决样式冲突 2016-03-04 09:57:54 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-03-04 09:33:38 +08:00
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/public.css
 2016-03-04 09:32:49 +08:00
huang 5ab9e3b5b7 资源搜索 
作业留言
 2016-03-04 09:29:20 +08:00
huang e9c9112b38 公共资源封装 2016-03-04 00:41:41 +08:00
huang ba9b22fbe1 公共资源，删除、重命名 2016-03-03 23:56:06 +08:00
huang 3dacf900d5 修改导入公共、我的资源 2016-03-03 23:24:25 +08:00
huang 085729f91b 课程活跃度中添加作业留言得分 2016-03-03 18:51:28 +08:00
huang fee7cc4b2c 课程推荐中不显示私有课程 2016-03-03 18:10:30 +08:00