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

3428 Commits

Author SHA1 Message Date
huang 64088f5a21 项目数据存入数据库（统计数据直接从数据库获取） 2016-01-13 10:08:48 +08:00
huang 762ebb150b 解决课程资源重复分页问题 2016-01-08 18:09:11 +08:00
huang 0ab500986a 发送搜索功能 2016-01-08 18:03:59 +08:00
huang 57af22e3af 项目资源库tag增、删、改ajax 2016-01-08 16:30:04 +08:00
huang fd2197a73d 项目资源库历史数据迁移 
搜索功能添加Version类型判断
 2016-01-08 11:01:29 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +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
huang c4718f992c 项目资源搜索 2016-01-06 11:05:52 +08:00
huang 470f45becd 课程讨论区（未完） 2016-01-04 17:05:32 +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
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