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

1564 Commits

Author SHA1 Message Date
huang ff2340baf9 课程统计信息优化 2016-03-25 10:42:26 +08:00
huang cb4b26762d 课程base优化 2016-03-25 09:56:45 +08:00
alan 13e265b7d2 优化 layouts/_user_projects 和 layouts/_user_courses页面 2016-03-23 18:25:50 +08:00
ouyangxuhua 1579a86f9f 老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示 2016-03-23 17:19:25 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
alan 9273e37a5b 优化SQL查询：1，members与users表关联查询； 2，blogs表单查询 2016-03-23 00:04:53 +08:00
linchun 6284b8d4f9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:57:59 +08:00
ouyangxuhua 84703a3e01 组织配置中的添加成员，链接使用https://www形式 2016-03-18 16:35:36 +08:00
ouyangxuhua a1fbe8b886 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:33:17 +08:00
ouyangxuhua b5964fba0b 组织超链接问题 2016-03-18 14:44:39 +08:00
huang bff20ee072 英雄榜数据显示问题 2016-03-18 14:16:23 +08:00
linchun d3635067b7 Merge remote-tracking branch 'remotes/origin/develop' into linchun 2016-03-18 13:01:39 +08:00
huang 4999b47b44 项目去掉ID 2016-03-17 16:46:26 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-17 16:06:36 +08:00
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/files/_org_subfield_list.html.erb
	db/schema.rb
 2016-03-17 16:06:05 +08:00
cxt 6b8ae56ce4 Merge branch 'alan_develop' into develop 2016-03-17 16:04:06 +08:00
cxt d72aa3a93c Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css
 2016-03-17 15:27:52 +08:00
alan a4e2fd741e 删除issue，返回页面不变 2016-03-17 14:13:29 +08:00
linchun 34c9f54510 完成了管理员界面学校列表 2016-03-16 15:24:41 +08:00
ouyangxuhua baf547417e 组织下的链接用Setting.protocol表示协议 2016-03-16 14:57:32 +08:00
ouyangxuhua ea6de1407e Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
 2016-03-16 12:36:15 +08:00
ouyangxuhua dcadadae03 退出和用户的链接使用https:// +Setting.host_name 2016-03-16 11:24:55 +08:00
ouyangxuhua da1b27cd38 Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang 2016-03-16 10:01:42 +08:00
cxt 2ce2134f0b 浏览器tab的title，显示用户姓名，不是登录名 2016-03-15 17:25:46 +08:00
ouyangxuhua b716e593b5 组织下的链接问题 2016-03-15 13:49:44 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +08:00
ouyangxuhua 2a46d60433 组织下的链接的host_name均使用Setting.host_name 2016-03-15 11:19:03 +08:00
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/public.css
 2016-03-15 11:09:11 +08:00
huang 2b21213b7f 公共资源库，排序 2016-03-15 09:26:26 +08:00
ouyangxuhua 402b0e9c24 域名都使用Setting.host_name获取主机名 2016-03-14 23:15:08 +08:00
ouyangxuhua 15dfaf67b2 测试版环境，登陆注册改成https://test.forge. 2016-03-14 18:29:50 +08:00
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示 2016-03-14 15:39:45 +08:00
ouyangxuhua a7312a6191 修改游客下载组织资源的权限 2016-03-14 14:43:30 +08:00
ouyangxuhua f496761325 将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名 2016-03-14 11:00:55 +08:00
cxt 98f7ad19f6 Merge branch 'linchun' into develop 2016-03-11 19:34:33 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-11 17:25:30 +08:00
cxt ef5625ccdf 延期发布的课程资源设为公开后不应对学生可见 2016-03-11 11:17:44 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
ouyangxuhua 766569afa6 1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间 2016-03-10 16:43:50 +08:00
ouyangxuhua f917e96a12 组织栏目中的链接的url更新 2016-03-10 12:47:10 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +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 f469e51202 课程模块/通知、作业、留言、发帖，删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
ouyangxuhua 5d1d56fbb3 组织下链接改成https://www.形式 2016-03-08 16:44:03 +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
ouyangxuhua c3eb8e05cd 组织的私有资源，数量一致 2016-03-07 18:12:40 +08:00
ouyangxuhua ce187b4212 组织资源下载权限控制 2016-03-07 17:18:01 +08:00
huang d6dedf03cb 去掉puts注释 2016-03-06 12:18:57 +08:00
huang d30e73795d 积分规则 2016-03-06 12:15:57 +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
linchun bb8a6af13e admin界面添加精品课程页面，目前该页面中的精品课程是固定的 2016-03-04 15:31:40 +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 0cd536fcc9 题库增加发布者姓名搜索 2016-03-04 10:34:04 +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 085729f91b 课程活跃度中添加作业留言得分 2016-03-03 18:51:28 +08:00
huang fee7cc4b2c 课程推荐中不显示私有课程 2016-03-03 18:10:30 +08:00
cxt 050257e885 作业添加挂起的状态 2016-03-03 17:24:07 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 6893b3dcab 修复分页问题 2016-03-02 14:56:25 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
cxt f6f84b564e 在线测验的选项和候选答案的正确显示 2016-03-01 15:18:38 +08:00
cxt 5b4cec2c05 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 16:26:51 +08:00
newuser d2bd4706d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-02-26 14:57:41 +08:00
newuser d747ec854d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 14:55:28 +08:00
huang a6abdbacb9 Merge branch 'hjq_course' into hjq_new_course 2016-02-25 11:19:20 +08:00
huang 635e6300a1 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 
Conflicts:
	app/helpers/users_helper.rb
	app/views/users/_project_issue_detail.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
	db/schema.rb
 2016-02-25 11:17:54 +08:00
huang aef2dd8d1a 版本库通过修订好，导出对应的文件，导出对应内容 
高亮显示内容
内容修订对比 功能
 2016-02-25 11:06:10 +08:00
Tim b376c5c6cd 版本库和问题跟踪的function样式冲突 2016-02-24 15:47:30 +08:00
cxt a2e60944be 已发布资源的延期发布 2016-02-23 11:04:19 +08:00
cxt 98946b9855 课程上传资源弹框的延迟发布功能 2016-02-22 18:10:20 +08:00
huang 3fda270a66 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-02-20 16:58:20 +08:00
huang 212b37ef84 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 16:19:53 +08:00
huang a7470e059d 历史版本提供附件下载功能 2016-02-20 16:19:35 +08:00
cxt e04e80d64d 跨越多个学期的课程学期的显示 2016-02-20 16:18:28 +08:00
guange 2cf253a26b 复制课程图片出错 2016-02-04 17:30:49 +08:00
cxt cb2fdc7388 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/words/create_reply.js.erb
 2016-02-02 15:57:23 +08:00
cxt 368e4cd14a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-02 15:51:49 +08:00
guange d6e248805f changeset_num nil问题 2016-02-02 11:37:48 +08:00
ouyangxuhua 25e32f09e1 Merge branch 'develop' into ouyang 
Conflicts:
	app/views/words/create_reply.js.erb
 2016-02-01 10:14:04 +08:00
guange 71778ba948 拷贝课程图标 2016-01-29 22:10:04 +08:00
ouyangxuhua 45bf2ef88a Merge branch 'develop' into dev_hjq 2016-01-29 19:00:15 +08:00
ouyangxuhua b7f1177938 1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新 2016-01-29 18:11:16 +08:00
cxt 8358140c87 问题跟踪目标版本字体修改 2016-01-29 17:02:25 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
cxt e9a7f6f826 导出学生作业成绩列表 2016-01-29 11:02:57 +08:00
cxt af7ca36c92 学生加入课程或退出课程 2016-01-26 15:59:39 +08:00
Tim 6a83a9b55c 问题跟踪样式更改 2016-01-25 15:43:37 +08:00
huang 154417378e 精品课程默认推荐 2016-01-24 10:58:58 +08:00
huang 49d0d214de 精品课程默认排序 2016-01-24 08:48:38 +08:00
huang 58b5dbdf9a 版本库最近一次提交时间存入数据库 
精品课程数据迁移
 2016-01-22 18:00:01 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
huang 2947ff8997 精品课程数据迁移 2016-01-22 16:46:23 +08:00
cxt 338c224846 课程配置页面的结束学期可修改 2016-01-22 15:17:11 +08:00
huang edd198e91f issue刷新 2016-01-22 14:21:17 +08:00
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_project_issue.html.erb
	db/schema.rb
 2016-01-21 16:10:29 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course 
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
 2016-01-20 17:05:28 +08:00
huang f3b5f4e5f7 修改浏览器tab页通过不同的模块展示不同内容 2016-01-20 16:58:41 +08:00
huang 0db69e1ebf 解决课程导语时间和课程创建动态时间一致的问题 2016-01-20 16:32:47 +08:00
huang c5d935108e 完成课程按tag搜索推荐 2016-01-20 15:59:30 +08:00
huang 18c3c23d2c 课程推荐 2016-01-20 15:43:33 +08:00
cxt b64fc1771d Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-20 09:27:29 +08:00
ouyangxuhua d0c2eabddd 未登陆情况下，也能下载组织下的文件 2016-01-19 16:42:10 +08:00
huang 5862c16c68 完成精品课程推荐 
过滤掉私有课程
过滤掉已删除的课程
 2016-01-18 17:36:18 +08:00
huang ef0a2a54c5 精品课程推荐 2016-01-18 15:48:26 +08:00
huang f52b0c1cc6 标记精品课程，精品课程推荐 2016-01-18 10:16:29 +08:00
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改 2016-01-18 10:13:31 +08:00
huang eecdc26b2f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 15:42:36 +08:00
huang 86516df88a Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/helpers/application_helper.rb
 2016-01-15 15:41:02 +08:00
huang 440be81587 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2016-01-14 15:02:30 +08:00
ouyangxuhua a1f8db65fc Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-14 14:40:13 +08:00
huang 49d456bf21 修改数据统计信息 2016-01-14 14:32:19 +08:00
huang 4b26e77478 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/models/issue.rb
	app/models/message.rb
	app/models/news.rb
处理冲突
 2016-01-13 16:28:00 +08:00
huang 24df6d30d6 项目得分弹出页面 2016-01-13 16:15:46 +08:00
huang 05cf2d24dc 新项目积分系统 
讨论区回复加入得分系统
版本库行号显示错误问题
 2016-01-13 15:29:29 +08:00
ouyangxuhua 6cfda615d6 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
cxt b48a2848b0 首页、课程、项目、组织动态增加更新时间 2016-01-12 15:53:15 +08:00
huang 83881766b2 提交总数接口获取修改 2016-01-12 11:01:58 +08:00
cxt a93539da5e 课程学期往前推一个学期 2016-01-11 11:07:03 +08:00
huang 8c10ce6fee 修改组织500问题 2016-01-08 21:47:42 +08:00
huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-08 18:11:54 +08:00
ouyangxuhua 626e3da1e6 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-08 18:09:21 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
cxt 2d73933f4f 已经删除了的课程还显示在新建作业的发布课程列表中 2016-01-08 09:46:07 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
huang d0a8b4bc18 项目资源云搜索 2016-01-06 18:07:35 +08:00
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-06 09:27:00 +08:00
cxt f52dc37a76 作业动态添加作品评阅和作品提交消息 2016-01-05 11:29:30 +08:00
huang 81bb35ac49 项目资源库 资源列表 2016-01-05 10:01:56 +08:00
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
 2015-12-31 15:44:57 +08:00
ouyangxuhua 358510a2e6 解决组织配置资源栏目中，增加/删除栏目不能更新的问题 2015-12-31 14:55:41 +08:00
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +08:00
lizanle be146a9421 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-12-31 11:11:38 +08:00
lizanle 1d0e6e1c5c 课程发送资源 以及 项目发送资源 2015-12-30 09:37:16 +08:00
lizanle 3b08adfc68 课程资源页面修改。 2015-12-27 23:24:21 +08:00
huang a92d33300b 里程碑 添加 “已解决”，区分已解决和已关闭 2015-12-24 17:18:52 +08:00
huang f7f03b2094 0 2015-12-24 16:10:41 +08:00
huang 8639609832 切换分支--暂时待处理 2015-12-24 15:42:05 +08:00
huang 055fac5e27 修改项目得分 2015-12-23 17:29:40 +08:00
huang 00711f1100 issue编辑、添加邮件中去掉token 2015-12-23 16:12:23 +08:00
huang 4092401e68 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 21:22:08 +08:00
huang d2ba950044 绝对成 2015-12-18 21:03:36 +08:00
huang 5941d41b19 测试 2015-12-18 20:53:32 +08:00
huang 747493993b 上线测试 2015-12-18 19:57:08 +08:00
huang e673540323 还原提交次数 2015-12-18 18:51:29 +08:00
huang 4dda355d2e 测试版 2015-12-18 18:28:20 +08:00
guange e02b865fa6 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:09:01 +08:00
guange 57b1c0c7d8 at是否开启加入到配置 2015-12-18 17:02:50 +08:00
huang 8a53978d23 项目得分更新 2015-12-18 14:51:33 +08:00
guange d703f75c98 merge 2015-12-18 09:23:52 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
huang 5259831224 Merge branch 'szzh' into hjq_new_course 2015-12-18 09:17:49 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
cxt c7f321475a 多选题错判 2015-12-17 19:05:22 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
guange fc63dfcb7b 消息通知 2015-12-17 15:14:52 +08:00
ouyangxuhua de229c0f1c 组织资源栏目的文件可以被引用至当前组织下的资源栏目 2015-12-17 14:51:02 +08:00
cxt fa0f9c6751 分组作业的编辑，若分组作业已提交了作品则不可再编辑分组设置 2015-12-17 10:16:29 +08:00
huang bb23049f55 版本库提交次数封装 
提交页面样式修改
 2015-12-16 17:04:17 +08:00
lizanle ef2f142f62 论坛资源允许下载 2015-12-15 18:12:32 +08:00
ouyangxuhua af157a9c63 组织资源栏目增加标签功能 2015-12-15 17:30:24 +08:00
lizanle 88c2db47b7 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/helpers/application_helper.rb
 2015-12-15 08:48:08 +08:00
guange 4f57e48b92 merge 2015-12-14 18:20:32 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
guange f61f639af2 转换为remote js 2015-12-14 17:13:57 +08:00
lizanle c5f903146d 博客资源下载问题 2015-12-14 11:19:43 +08:00
lizanle 14912078ee 博客资源允许下载 2015-12-14 11:03:04 +08:00
ouyangxuhua 0602a03e12 组织资源类型的栏目，增加搜索功能 2015-12-14 10:26:34 +08:00
huang a791c39b4b Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:12:25 +08:00
cxt 42f0fc62e9 分组成员不能修改作品 2015-12-11 18:07:30 +08:00
ouyangxuhua de0b5d1897 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-11 16:58:19 +08:00
ouyangxuhua e98338bf22 栏目增加资源类型，可以添加文件、删除文件、显示文件等 2015-12-11 16:30:50 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
cxt 4e04df7a8a 分组作业的动态显示及关联项目 2015-12-09 16:33:48 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
guange 3476731b83 将at js data整合到文件中 2015-12-09 09:59:13 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
guange 1a2aff99be 调整显示的格式 2015-12-07 14:18:01 +08:00
cxt 79ce5c9ac5 匿评已结束时作业动态的作品按钮显示成“查看作品” 2015-12-07 11:31:37 +08:00
guange af31946586 issue列表开启AT功能 2015-12-06 15:03:12 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +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 501a8f905b Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/courses.css
 2015-11-27 14:56:30 +08:00
huang 36b1649fbd Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-11-27 14:49:49 +08:00
huang 1cc6e305ed 完成新功能模块开发： 
1、如果没有成绩则不显示
2、工具框展开没有则不显示
 2015-11-27 13:52:40 +08:00
Gan Yi.ang ee85cc35ed Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-11-27 11:27:03 +08:00
Gan Yi.ang 1115d54d9a 非trustie用户changesets_latest_coimmit 2015-11-27 11:25:16 +08:00
huang 042b197767 课程英雄榜界面调整 
动作触发的时候更新总分
更换迁移顺序
 2015-11-27 10:49:41 +08:00
cxt 1f2675020b 学生答题未完成时可保存试卷 2015-11-27 10:15:25 +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
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
huang c8b1cae947 建立贡献榜表及相关关联 
部分页面
按总分排序（英雄榜）
部分页面（未完成）
 2015-11-25 15:16:33 +08:00
huang 85515befc4 实现工具栏数字大于0显示，小于0隐藏 2015-11-24 17:29:57 +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 dd148fb7c5 Merge branch 'szzh' into sw_new_course 
Conflicts:
	db/schema.rb
 2015-11-20 20:25:17 +08:00
huang bb726e3475 提交答案验证 2015-11-20 18:21:31 +08:00
cxt eee63b2495 提交前验证数据不为空 2015-11-20 17:25:03 +08:00
huang db46e5e4af 问卷得分统计 2015-11-20 15:13:53 +08:00
huang 3deebf2006 show 2015-11-20 11:08:47 +08:00
huang 21694daa59 多选顺序按小到大排序 2015-11-20 10:05:34 +08:00
huang 08c7eb8d40 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 21:21:26 +08:00
huang 81e2827277 解决参数为空的bug 2015-11-19 21:21:02 +08:00
cxt 9aee23507c 学生答题页面、答题结果页面、老师的试卷页面 2015-11-19 21:19:18 +08:00
huang 8cf22767f9 新建问答题 2015-11-18 19:58:00 +08:00
huang 1606e9ddab 0 2015-11-18 18:28:17 +08:00
cxt d83e2e36ae Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 16:51:58 +08:00
huang cd2d947cb2 多项选择标准答案 2015-11-18 16:06:34 +08:00
cxt f850a71b59 测验 2015-11-18 15:30:39 +08:00
huang 935b1f9f9e 大写小写问题 2015-11-18 14:50:03 +08:00
huang de17ffa605 区分答案大小写 2015-11-18 14:31:35 +08:00
huang 3efae6bde2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 14:06:38 +08:00
huang 8965775004 show方法修改 2015-11-18 14:06:21 +08:00
cxt 0405d4eee6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 14:05:47 +08:00
cxt 249b15751d 新建多选题 2015-11-18 14:05:29 +08:00
huang 7f5fa7fb6f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/helpers/exercise_helper.rb

解决冲突
 2015-11-18 14:03:17 +08:00
huang deb0f151c4 单选数字转换 2015-11-18 13:55:42 +08:00
cxt 265fe08b2c 在线测验 2015-11-18 10:49:57 +08:00
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表，建立相应模型及控制器； 
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
 2015-11-17 17:34:50 +08:00
huang 23ca20692f 问卷部分方法 2015-11-17 15:20:59 +08:00
huang 0316bf698f exercise新增、update 2015-11-17 11:25:17 +08:00
cxt 10ac8eaa35 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-16 10:58:08 +08:00
cxt e22b4cbdeb 作业提交截止后，未提交作品的学生看到的作业动态将显示“补交作品” 2015-11-16 10:44:27 +08:00
cxt 62d80c27d6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-16 08:59:54 +08:00
huang ca8b62b8bd Merge branch 'szzh' into gitlab_guange 2015-11-14 15:22:05 +08:00
ouyangxuhua 38acb4230e 组织动态添加项目动态 2015-11-14 14:31:52 +08:00
huang ddbc9003c2 每个用户不能创建同名版本库 
不同的用户可以创建不同版本库
更新fork接口方法
 2015-11-13 20:24:30 +08:00
huang a40e5c5b54 frok功能开发--权限还未完成 2015-11-13 17:30:14 +08:00
ouyangxuhua 78e1ae4188 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-11-13 17:27:33 +08:00
ouyangxuhua 71e6a8b135 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-13 17:21:44 +08:00
sw 70c5b27a43 相关路由 2015-11-13 16:40:39 +08:00
lizanle e265047ba9 搜索成员翻页靠右 2015-11-12 19:37:28 +08:00
lizanle b24fadea05 设置 删除 编辑按钮做成项目一样的 2015-11-12 19:15:35 +08:00
ouyangxuhua a3443ba968 组织模块功能实现 2015-11-12 09:32:00 +08:00
cxt 5d03a27170 启动匿评和关闭匿评时自动刷新该动态 2015-11-06 14:57:39 +08:00
ouyangxuhua 283af137c6 组织模块动态及配置 2015-11-05 17:57:07 +08:00
cxt 8e3b04f9e3 禁用匿评&&作业截止&&作品已提交 学生可查看所有作品列表 2015-11-05 16:43:12 +08:00