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

3478 Commits

Author SHA1 Message Date
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