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

3763 Commits

Author SHA1 Message Date
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
ouyangxuhua fa08935f68 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/projects/settings/_new_repositories.html.erb
 2016-02-20 11:13:38 +08:00
huang 534d93de77 弹框位置调整 2016-02-20 10:59:49 +08:00
cxt 096320d04c 发布问卷时默认选中“允许学生查看调查结果” 2016-02-20 10:50:46 +08:00
guange b2551f904b 组织没有显示的问题 2016-02-04 12:51: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
cxt 8b9bcb4719 导入题库的搜索不起作用 2016-02-01 10:04:07 +08:00
guange 71778ba948 拷贝课程图标 2016-01-29 22:10:04 +08:00
guange 724ff31751 Merge remote-tracking branch 'origin/szzh' into szzh 2016-01-29 21:16:27 +08:00
guange eb9232a087 at controller 的json应该登录 2016-01-29 21:15:23 +08:00
cxt ee73191a19 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 19:44:04 +08:00
cxt 1b5cdbe628 推荐的私有课程，点击“资源”返回403，点击“作业”也应该返回403 2016-01-29 19:41:47 +08:00
ouyangxuhua b7f1177938 1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新 2016-01-29 18:11:16 +08:00
Tim fa70e8a714 代码错误 2016-01-29 16:51:46 +08:00
cxt da81fb533e Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
cxt b5cf138f43 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
	db/schema.rb
 2016-01-29 15:44:26 +08:00
cxt d3ba23bc64 课程的作业列表增加搜索按钮 2016-01-29 15:37:03 +08:00
cxt e9a7f6f826 导出学生作业成绩列表 2016-01-29 11:02:57 +08:00
cxt c942c843b9 导入作业增加引用次数 2016-01-28 16:27:46 +08:00
cxt 8cc87c007f 导入作业添加作业类型 2016-01-28 09:51:05 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +08:00
ouyangxuhua 135cb410bc 1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突 2016-01-27 15:29:15 +08:00
guange d8ef2f0965 个人留言中的at启用 2016-01-26 18:24:15 +08:00
cxt 19003f27fc 课程添加is_copy属性 2016-01-26 15:05:45 +08:00
cxt 520811fdc7 留言按回复的更新时间排序 2016-01-26 11:17:55 +08:00
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +08:00
ouyangxuhua dda64245b3 解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。 2016-01-26 10:35:54 +08:00
cxt 945d0a933f 项目资源统计为负数 2016-01-25 17:34:04 +08:00
cxt 184e0ee689 管理员界面增加项目、组织、课程、用户、作业个数的显示 2016-01-25 16:50:34 +08:00
cxt b6e13340e5 个人留言的删除功能 2016-01-25 15:33:50 +08:00
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能 2016-01-25 14:19:39 +08:00
Tim a2afec77e3 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 
Conflicts:
	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-01-25 11:32:55 +08:00
cxt 4465e93dae 最近登录报500 2016-01-25 10:16:33 +08:00
cxt 4530e7896a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 20:55:31 +08:00
cxt 8a2a1d2bc9 Merge branch 'szzh' into develop 2016-01-22 20:55:18 +08:00
cxt fc0b589760 Merge branch 'cxt_course' into szzh 2016-01-22 20:54:14 +08:00
cxt 3de8687440 留言页面的动态内容不生成链接，留言回复的样式更改 2016-01-22 20:11:49 +08:00
huang 19bb545993 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 18:49:28 +08:00
huang 16cb4add09 issue局部刷新属性问题 2016-01-22 18:48:40 +08:00
ouyangxuhua 26f8500671 博客回复后，该博客的更新时间为当前时间 2016-01-22 18:42:50 +08:00
ouyangxuhua 2d07801f52 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 18:10:50 +08:00
ouyangxuhua dbed8379d3 新建组织允许游客下载选项功能修复 2016-01-22 18:10:32 +08:00
huang 58b5dbdf9a 版本库最近一次提交时间存入数据库 
精品课程数据迁移
 2016-01-22 18:00:01 +08:00
huang e063470a57 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:30:07 +08:00
ouyangxuhua b5bfa6d824 1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。 2016-01-22 16:56:36 +08:00
ouyangxuhua b6219c149a 解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除； 2016-01-22 16:10:05 +08:00
ouyangxuhua b5159d54c8 博客按更新时间排序 2016-01-22 15:05:52 +08:00
huang edd198e91f issue刷新 2016-01-22 14:21:17 +08:00
ouyangxuhua 594ce8a304 修改几个bug 2016-01-21 16:57:13 +08:00
ouyangxuhua b6460633d2 个人博客按更新时间倒排 2016-01-21 16:15:45 +08:00
ouyangxuhua 600f5de32e 个人动态进入个人博客编辑后，跳转到个人首页 2016-01-21 16:11:06 +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
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua bd99352ab1 组织增加是否允许游客下载的选项 2016-01-21 15:31:36 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一，分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
huang 7de48f143e issue状态修改 2016-01-21 10:38:07 +08:00
ouyangxuhua ece9f9dc6f 项目新闻使用方块样式 2016-01-21 10:33:53 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +08:00
ouyangxuhua 340d404ecd 组织栏目的通知增加查、改、删功能 2016-01-20 17:23:02 +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
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
cxt fe0414c83f 组织文章和博客的点赞 2016-01-20 10:53:05 +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
cxt e293805488 点击在线问卷时若未登录则直接跳到登录页面 2016-01-19 15:41:53 +08:00
huang b93b86b9a0 创建课程发送board 2016-01-18 17:16:33 +08:00
cxt 7f7d0ac6f7 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-18 17:12:56 +08:00
cxt c5935a6a46 博客动态添加点赞 2016-01-18 15:52:38 +08:00
cxt 9cabb0248a 已点过赞的动态显示”已赞“ 2016-01-18 15:12:47 +08:00
ouyangxuhua f796aa1489 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-18 10:54:17 +08:00
ouyangxuhua 03df9abfeb 增加域名唯一性判断 2016-01-18 10:43:22 +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
cxt c49a290d56 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-15 10:24:37 +08:00
cxt 0be6e36020 缺陷、通知、个人留言动态的点赞 2016-01-14 21:07:05 +08:00
huang 9bbb1e0f90 修改fork时候项目ID问题 2016-01-14 20:48:12 +08:00
cxt 57cfe49602 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 18:08:19 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +08:00
cxt eb63ac59f2 作品提交不成功 2016-01-14 16:58:40 +08:00
cxt 58c96a0df0 作业动态的点赞 2016-01-14 16:15:40 +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 5fe4e9e813 创建项目的时候创建项目得分记录 2016-01-14 12:52:44 +08:00
ouyangxuhua d6e7a2ade5 解决一些bug 2016-01-14 12:51:01 +08:00
ouyangxuhua 324513fc94 组织栏目子目录功能实现 2016-01-14 10:33:15 +08:00
cxt bf6f46174e 课程讨论区回复的点赞 2016-01-14 10:07:46 +08:00
cxt 093574ebef 首页课程讨论区动态的点赞 2016-01-13 19:16:51 +08:00
cxt 5c1ff1f6f7 关联项目时不显示已删除的项目 2016-01-13 18:42:25 +08:00
guange d935532f8d 课程讨论区at功能 2016-01-13 17:50:08 +08:00
cxt b73aab1cf6 课程讨论区的点赞 2016-01-13 16:32:05 +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
ouyangxuhua 897eabd57a 修改快捷菜单权限问题及样式 2016-01-13 16:21:37 +08:00
huang 7697dadbea 版本库统计次数刷新版本库的时候自动更新 2016-01-13 15:50:55 +08:00
ouyangxuhua 6cfda615d6 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
huang 165d5f50c8 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/controllers/files_controller.rb
	db/schema.rb
处理冲突
 2016-01-13 13:01:26 +08:00
huang 64088f5a21 项目数据存入数据库（统计数据直接从数据库获取） 2016-01-13 10:08:48 +08:00
Tim 46217fb85d 切换分支后新出现文件 2016-01-13 10:02:43 +08:00
ouyangxuhua 7bcf995eaf Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
	public/stylesheets/share.css
 2016-01-13 09:58:14 +08:00
ouyangxuhua 8ead573872 组织设置url 2016-01-13 09:56:24 +08:00
ouyangxuhua 5d9ce929d9 组织栏目子目录 2016-01-13 09:34:33 +08:00
ouyangxuhua d5fc0277a2 3.2组织资源的样式更新 2016-01-12 16:43:40 +08:00
cxt b48a2848b0 首页、课程、项目、组织动态增加更新时间 2016-01-12 15:53:15 +08:00
huang 83881766b2 提交总数接口获取修改 2016-01-12 11:01:58 +08:00
huang 28c3dca099 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 22:30:48 +08:00
cxt 66c3cee3f8 课程关联组织列表 2016-01-08 22:30:04 +08:00
huang c719fd96a3 0 2016-01-08 22:29:57 +08:00
cxt a3370b693c 课程关联组织列表为空 2016-01-08 21:46:10 +08:00
huang f9bc1efd7c issue编辑的时候ajax刷新附件 2016-01-08 21:18:08 +08:00
huang 3df542ff6a Merge branch 'szzh' into develop 2016-01-08 20:46:06 +08:00
huang 64889fd14a 项目资源提供新分页 2016-01-08 20:10:43 +08:00
ouyangxuhua 5d819625c0 快捷菜单上传文件使用最新的上传方式 2016-01-08 20:09:57 +08:00
ouyangxuhua 3a62db6475 Merge branch 'dev_hjq' into szzh 2016-01-08 19:34:36 +08:00
ouyangxuhua ceeec3af12 修改一些bug 2016-01-08 19:33:58 +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
huang 762ebb150b 解决课程资源重复分页问题 2016-01-08 18:09:11 +08:00
cxt 90f6f07f19 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 18:06:28 +08:00
huang 0ab500986a 发送搜索功能 2016-01-08 18:03:59 +08:00
huang 57af22e3af 项目资源库tag增、删、改ajax 2016-01-08 16:30:04 +08:00
ouyangxuhua b2bad60b38 1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页 2016-01-08 16:16:57 +08:00
ouyangxuhua c500fc13db 解决组织动态中，第二页重复显示第一页动态的问题 2016-01-08 15:21:24 +08:00
ouyangxuhua 5eceb3d841 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
huang fd2197a73d 项目资源库历史数据迁移 
搜索功能添加Version类型判断
 2016-01-08 11:01:29 +08:00
cxt 2aea4da310 导出的测验成绩列表添加”班级“ 2016-01-08 10:37:10 +08:00
guange 067f3be598 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 09:42:04 +08:00
guange 5ebfbc901a at排序按照拼音来 2016-01-08 09:41:12 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +08:00
cxt 05f822a5c2 导出在线测验成绩列表 2016-01-07 16:43:03 +08:00
cxt 2b75c1e11a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-07 15:29:38 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
ouyangxuhua e90a237a8a 2.1博客增加“设为主页”的功能 2016-01-07 15:09:09 +08:00
huang 8f7d5c8a35 项目资源库，上传资源类型，创建资源 2016-01-07 14:47:47 +08:00
huang 972f2bfea8 完成项目资源库tag云的查询统计 2016-01-07 10:31:22 +08:00
huang d0a8b4bc18 项目资源云搜索 2016-01-06 18:07:35 +08:00
ouyangxuhua eacf89100d Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	config/routes.rb
	db/schema.rb
	public/images/hwork_icon.png
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-06 16:27:42 +08:00
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能； 
2.增加私信功能
 2016-01-06 16:22:13 +08:00
huang c4718f992c 项目资源搜索 2016-01-06 11:05:52 +08:00
Tim 17800e8cf2 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-06 10:36:28 +08:00
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题； 
2.组织申请子域名功能。
 2016-01-05 16:46:06 +08:00
huang 0d6ad9ffac 修改课程删除后可以显示的问题 2016-01-04 17:08:15 +08:00
huang 470f45becd 课程讨论区（未完） 2016-01-04 17:05:32 +08:00
ouyangxuhua 8dd34f91c3 课程/项目配置关联组织，仅关联用户的组织 2016-01-04 15:12:38 +08:00
huang 9e87e63b82 系统消息去掉附件 2016-01-04 10:36:27 +08:00
huang 3394af7ad5 Merge branch 'develop' into hjq_new_course 2016-01-04 10:29:13 +08:00
cxt 7f751cfc63 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-31 17:58:59 +08:00
huang 11444f43f0 解决issue多附件，删除一个附件后，提交弹出白色框框的问题 2015-12-31 17:55:48 +08:00
cxt f0216cf604 Merge branch 'cxt_course' into szzh 2015-12-31 17:53:52 +08:00
cxt 3dac8d2944 课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限 2015-12-31 17:53:05 +08:00
huang 0541294c33 为解决完： 
1、user_message_system附件显示问题
2、issue回复添加附件问题
 2015-12-31 17:08:27 +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
cxt 9b974b6170 Merge branch 'cxt_course' into szzh 
Conflicts:
	db/schema.rb
 2015-12-31 15:39:07 +08:00
lizanle c3b7662cac issue按更新时间排序 2015-12-31 15:17:48 +08:00
lizanle fccbbe6e2b 不允许重复发送。但是发送过程不会给予提示。如果课程或者项目或者组织已经有了该资源，那么该资源的更新时间会变化 2015-12-31 14:52:50 +08:00
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +08:00
lizanle 57ef7a2d4a 发送资源默认为私有的。 2015-12-31 12:41:09 +08:00
lizanle 2c7ef034cb 资源库更改 2015-12-31 12:27:31 +08:00
cxt 2c5a4f8a13 发布和编辑作业时的启用匿评改为禁用匿评，默认不选中 2015-12-31 11:36:21 +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
Tim e876cb09d9 自动出现的controller文件 2015-12-31 10:28:58 +08:00
lizanle b132e8483c 个人资源库搜索不到组织资源 2015-12-31 09:08:07 +08:00
ouyangxuhua 68a6f3f7f2 1.组织管理员有删除帖子的权限；2.删除帖子后更新org_activities表 2015-12-30 18:44:54 +08:00
ouyangxuhua 29c720a8a4 1.权限管理问题 2015-12-30 17:45:15 +08:00
lizanle 0ef0045941 发送功能要添加copy_from 2015-12-30 17:39:00 +08:00
ouyangxuhua 82b8cb77fd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:28:04 +08:00
lizanle b7eda83def 历史资源功能 2015-12-30 17:27:44 +08:00
cxt a74cba5190 编程作业的迟交扣分有问题 2015-12-30 17:21:06 +08:00
cxt e948c94300 在线测验的填空题未断网时报网络异常 2015-12-30 15:49:16 +08:00
ouyangxuhua dcfe89c544 帖子发送到组织资源栏目，同时增加增删查改功能 2015-12-30 15:46:01 +08:00
ouyangxuhua d1ebc35e43 Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-12-30 10:37:28 +08:00
lizanle 1d0e6e1c5c 课程发送资源 以及 项目发送资源 2015-12-30 09:37:16 +08:00
huang 743950d264 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 18:13:15 +08:00
lizanle 659f322ca2 send resource to org 2015-12-29 17:58:36 +08:00
lizanle 1103e7eab4 find org where type is Resource 2015-12-29 17:38:59 +08:00
ouyangxuhua d203285cc1 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/organizations/_org_left_subfield_list.html.erb
 2015-12-29 17:18:21 +08:00
ouyangxuhua 15cff47c92 1.转发帖子时，当组织没有资源栏目时，给出提示； 
2.组织文章的附件显示在组织动态/组织文章列表中；
 2015-12-29 17:13:48 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
huang 5618fe067a 项目分页，点击加载 2015-12-29 16:40:07 +08:00
cxt c3ddbcfddf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 16:33:32 +08:00
cxt 5d2c760a8e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-29 16:32:35 +08:00
cxt 605ec52f8a 测验答题失败时提示网络异常 2015-12-29 16:31:19 +08:00
ouyangxuhua 77e0f0cd08 转发帖子新建帖子，并更新相关表 2015-12-29 15:49:24 +08:00
huang d6e765cf4a 修正讨论区删除跳转 2015-12-29 15:46:20 +08:00
cxt 6bdd6d3e03 课程添加设置菜单，设置页面的信息更改 2015-12-29 10:15:53 +08:00
lizanle 174f7c1972 Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	app/views/issues/_list.html.erb
 2015-12-28 16:57:05 +08:00
lizanle 5ce9a5109d issue存在重复 2015-12-28 16:55:46 +08:00
lizanle e35d2daa0a 课程资源库 2015-12-28 16:19:30 +08:00
ouyangxuhua 2076c9b449 Merge branch 'develop' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/base_org.html.erb
	app/views/organizations/_org_activities.html.erb
	db/schema.rb
	public/stylesheets/new_user.css
	public/stylesheets/org.css
	public/stylesheets/public.css
 2015-12-28 15:32:03 +08:00
ouyangxuhua 805d785140 解决点击转发项目/课程帖子没有反应的问题 2015-12-28 14:35:13 +08:00
cxt b991dc1edd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 19:02:34 +08:00
guange 4cd4d7b6dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 17:47:02 +08:00
guange e3b395960c base64的+号要处理一下 2015-12-25 17:46:45 +08:00
cxt bca503f171 追加附件必须填写描述 2015-12-25 17:07:27 +08:00
cxt 11bf8f77dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:59:33 +08:00
cxt 7f133c860a 发布和编辑作业时可设置是否启用匿评 2015-12-25 15:57:30 +08:00
huang a16d6803ae Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:48:41 +08:00
cxt 0b42430e2d 课程通知动态无法回复 2015-12-25 11:10:26 +08:00
cxt 82fa0f0aaf 公开的课程不勾选“学生列表公开”，但非课程成员却可以通过url访问该课程学生列表 2015-12-24 15:28:11 +08:00
ouyangxuhua c81f2f738a Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 
Conflicts:
	app/controllers/org_document_comments_controller.rb
	app/views/org_document_comments/_attachment.html.erb
 2015-12-24 11:13:20 +08:00
ouyangxuhua 59f42bb54f 1.将添加附加功能加入到组织列表中的新建组织文章； 
2.解决编辑文章附件不能上传的问题。
 2015-12-24 11:09:57 +08:00
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 
Conflicts:
	public/stylesheets/org.css
 2015-12-24 10:40:00 +08:00
cxt f26f71c07a 课程通知改成动态的模式 2015-12-24 09:57:32 +08:00
ouyangxuhua 73d377d06d 组织资源栏目显示转发的帖子 2015-12-23 16:49:05 +08:00
ouyangxuhua b9ae579622 将课程帖子转发至组织帖子栏目 2015-12-23 15:35:26 +08:00
ouyangxuhua 9dc2cb8541 添加组织文章附件功能 2015-12-23 10:40:50 +08:00
ouyangxuhua 2220e0b7cc 增加帖子-组织栏目关联表 2015-12-22 15:48:41 +08:00
guange 22d8fc9abd 作业附件乱码优化 2015-12-22 15:45:17 +08:00
cxt 1a042fd822 组织首页的加载更多动态重复加载 2015-12-22 10:54:27 +08:00
huang 4111cb53dc 解决fork部分项目404问题 2015-12-21 17:13:13 +08:00
houxiang 240a859f2d Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-21 16:45:58 +08:00
houxiang 21461fb583 修正了以前的方法调用 by 侯翔 2015-12-21 16:45:16 +08:00
huang 471e5f5370 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-21 16:29:58 +08:00
houxiang 3e57237969 修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔 2015-12-21 16:21:39 +08:00
lizanle 4630576146 issue的创建成功不需要提示sucess 2015-12-21 10:30:39 +08:00
cxt 65022f03cb 作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新 2015-12-18 21:34:31 +08:00
cxt 902570173d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 18:09:00 +08:00
ouyangxuhua 714dfdc2d5 解决组织资源栏目点击上传资源没反应的问题 2015-12-18 17:51:22 +08:00
cxt 108448cf4d 课程讨论区的加载更多 2015-12-18 17:28:47 +08:00
lizanle 0ed7d84914 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 15:22:35 +08:00
lizanle 084844941f 个人单位修改。 
聚焦就搜索所有的学校
 2015-12-18 15:22:29 +08:00
cxt 2eaa05306f Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/boards/_course_show.html.erb
 2015-12-18 15:08:38 +08:00
cxt ba4c93e4c4 Merge branch 'cxt_course' into szzh 2015-12-18 15:03:24 +08:00
cxt b65e84d166 未答测验的学生在测验截止时间到了后算作零分 2015-12-18 12:47:34 +08:00
lizanle 5d47afdc43 issue 删除回复的权限问题 2015-12-18 09:46:28 +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
houxiang fc2eae4c62 add something by hx 2015-12-17 20:56:30 +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 3b25616f0c 编辑作品时可编辑分组成员 2015-12-17 19:06:10 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
lizanle 8ce2dbc4b8 issue回复 2015-12-17 18:12:38 +08:00
guange 716604903b 修复讨论区at错误 2015-12-17 18:07:19 +08:00
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
lizanle 1dbccd81d6 issue回复的删除功能 2015-12-17 17:15:03 +08:00
cxt a2ebaa0729 分组作业提交作品时如果关联了项目则从项目成员中添加分组成员 2015-12-17 15:28:28 +08:00
guange fc63dfcb7b 消息通知 2015-12-17 15:14:52 +08:00
ouyangxuhua de229c0f1c 组织资源栏目的文件可以被引用至当前组织下的资源栏目 2015-12-17 14:51:02 +08:00
cxt 89d3d3821c 分组作业的导入 2015-12-17 10:38:14 +08:00
lizanle c183574a5e 博客回复 2015-12-17 10:19:43 +08:00
cxt fa0f9c6751 分组作业的编辑，若分组作业已提交了作品则不可再编辑分组设置 2015-12-17 10:16:29 +08:00
ouyangxuhua acb604883d 项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。 2015-12-17 10:01:28 +08:00
lizanle 0a3c5f6acc issues如果标题为空需要弹框报错 2015-12-17 09:22:01 +08:00
lizanle 71f6a637e0 帖子按时间倒排 2015-12-16 17:26:19 +08:00
lizanle ffd8d55aa6 memo更新时间 2015-12-16 17:08:59 +08:00
huang bb23049f55 版本库提交次数封装 
提交页面样式修改
 2015-12-16 17:04:17 +08:00
lizanle a0035a4c1e issue 查询 2015-12-16 16:49:33 +08:00
lizanle b13ae8f599 issue 2015-12-16 15:55:40 +08:00
ouyangxuhua 977100e92e 双击资源栏目标签可编辑，编辑标签后更新标签 2015-12-16 11:17:06 +08:00