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

1332 Commits

Author SHA1 Message Date
ouyangxuhua 0f4d2e40fb 添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整 2016-03-25 19:09:25 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop 
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-25 16:16:55 +08:00
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
ouyangxuhua 589f939bbd 消息类型“学生再次提交作业”中的链接，应该打开学生作品 2016-03-24 11:39:38 +08:00
ouyangxuhua 3fc988757c 组织、项目、课程等在配置中添加成员时，对特殊字符'_'、‘/’添加转义，使能够搜索 2016-03-24 10:14:25 +08:00
huang f1ffd3852f Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-24 09:37:06 +08:00
huang 185ad829cd 项目访问速度优化 2016-03-24 09:36:46 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
huang 7967066b05 附件添加动态发送方式改变 2016-03-22 15:06:54 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +08:00
huang 51bd745b8d 课程讨论区限制改成20000 2016-03-18 13:39:28 +08:00
huang 8a8c9bf7c3 注释修改 2016-03-18 12:41:07 +08:00
huang 79767f4bae 用户行为记录 2016-03-17 17:22:07 +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
huang 03597b85ff 解决项目被淹没问题 2016-03-17 16:02:36 +08:00
huang 42d89c7ed0 课程导语发送这改成课堂使者 2016-03-17 15:12:28 +08:00
alan 0ac12f3400 Merge branch 'FX-alan-admin-deleteuser-500' into alan_develop 2016-03-16 11:16:52 +08:00
alan 5343759f2f Merge branch 'FX-alan-search-404' into alan_develop 2016-03-16 11:16:41 +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
huang 7c624cd571 公共资源只包括公开资源 2016-03-14 16:35:18 +08:00
ouyangxuhua a7312a6191 修改游客下载组织资源的权限 2016-03-14 14:43:30 +08:00
alan 3eaa4b08a3 解决删除用户报500错误 2016-03-14 11:06:29 +08:00
ouyangxuhua f496761325 将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名 2016-03-14 11:00:55 +08:00
alan 2f5ce553e2 refactor user find 2016-03-14 10:46:02 +08:00
alan 0998ca3974 Merge branch 'develop' into FX-alan-search-404 2016-03-14 10:25:39 +08:00
alan ce6d63ccaf 重构user.find 2016-03-14 10:24:50 +08:00
cxt 7d2bb572b2 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	public/stylesheets/new_user.css
 2016-03-11 19:43:36 +08:00
cxt a845da5c17 点赞有延迟 2016-03-11 19:25:24 +08:00
guange 45c51ef8db merge 2016-03-11 18:51:41 +08:00
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
ouyangxuhua 766569afa6 1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间 2016-03-10 16:43:50 +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 5b4ff5ec8a 学生列表中的作业积分为负分 2016-03-10 09:22:49 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
huang f469e51202 课程模块/通知、作业、留言、发帖，删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
huang d54609075b 区分新闻和新闻回复得分 2016-03-05 04:01:10 +08:00
huang f381784a3c 数据迁移 2016-03-05 03:13:58 +08:00
huang 9beaa62d6d 课程活跃度 2016-03-04 11:36:34 +08:00
huang 085729f91b 课程活跃度中添加作业留言得分 2016-03-03 18:51:28 +08:00
cxt 601c5906d4 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 17:00:29 +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
ouyangxuhua 956ce8045d Merge branch 'ouyangxuhua' into develop 2016-02-26 16:18:17 +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
cxt 09c8e57f1c 复制课程时可复制资源和作业 2016-02-26 10:41:14 +08:00
ouyangxuhua 991613d760 在转发表forwards记录发送帖子、通知 2016-02-25 16:22:42 +08:00
ouyangxuhua 11231d0ff9 1.解决组织配置报500的错误；2.增加转发表 2016-02-24 16:01:32 +08:00