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

1532 Commits

Author SHA1 Message Date
huang 7c9e20c9bf 登录注册样式 2016-03-29 16:51:50 +08:00
huang d28a46c48a 北斗资源库板块 2016-03-29 16:45:14 +08:00
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-29 13:51:46 +08:00
huang 2b9ddf3594 组织新版 2016-03-29 13:43:28 +08:00
huang b80bc98fcb 组织首页 2016-03-29 11:31:58 +08:00
huang b8463fcca5 北斗 2016-03-28 16:51:58 +08:00
cxt 33c9331c7b 课程设置为私有/公开 课程头部未刷新 2016-03-28 15:35:24 +08:00
huang 4b6b5504ca 北斗框架（未完） 2016-03-28 14:11:40 +08:00
huang 326730f6b1 北斗框架 2016-03-28 10:39:09 +08:00
huang 1bf494f661 课程推荐资源统计数 2016-03-25 20:11:26 +08:00
huang ba25f41bcb 添加教师统计数、学生统计数 2016-03-25 19:20:36 +08:00
alan 6862480632 修改当用户没有项目时，报错 2016-03-25 17:16:45 +08:00
alan 4587e728d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:07:42 +08:00
alan 05d66f41f9 fix bug when user don't have courses or projects 2016-03-25 17:07:30 +08:00
huang dea1c13a64 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/migrate/20160324074942_add_index_to_forge_activities.rb
 2016-03-25 16:33:22 +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 9ce39d2f4a Issue模块动态优化 2016-03-25 15:46:40 +08:00
huang 9549d695f6 讨论区局部优化 2016-03-25 14:29:58 +08:00
huang ff2340baf9 课程统计信息优化 2016-03-25 10:42:26 +08:00
huang cb4b26762d 课程base优化 2016-03-25 09:56:45 +08:00
ouyangxuhua 2d4f5284df 删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题 2016-03-24 17:03:51 +08:00
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
alan 0d049bbe1f refactor new_base_user 2016-03-24 10:07:39 +08:00
alan 13e265b7d2 优化 layouts/_user_projects 和 layouts/_user_courses页面 2016-03-23 18:25:50 +08:00
huang 70d594659e 课程英雄榜代码封装 2016-03-21 16:50:24 +08:00
huang e06695b56b 课程活跃度代码封装 2016-03-21 16:45:49 +08:00
ouyangxuhua 5c22b23f3a Merge branch 'develop' into ouyangxuhua 2016-03-18 14:52:51 +08:00
ouyangxuhua 1eafad6468 鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息 2016-03-18 10:05:31 +08:00
cxt b8b34f7861 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:23:47 +08:00
cxt 1489c8d924 课程简介没有内容就不要显示 2016-03-17 16:22:29 +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
cxt 602864bd71 个人主页课程列表: 1、增加学期信息 2、排序不对 2016-03-17 16:17:33 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +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
huang 5681d329d6 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/controllers/news_controller.rb
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-15 11:12:24 +08:00
ouyangxuhua 15dfaf67b2 测试版环境，登陆注册改成https://test.forge. 2016-03-14 18:29:50 +08:00
ouyangxuhua c0edd91c3d 登陆注册链接改为www. 2016-03-14 18:20:19 +08:00
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示 2016-03-14 15:39:45 +08:00
ouyangxuhua f496761325 将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名 2016-03-14 11:00:55 +08:00
cxt 7f302305ff Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-11 19:31:22 +08:00
cxt 1d93c6c56b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-11 16:18:10 +08:00
huang 97a7694778 访问统计数--views 2016-03-11 15:58:16 +08:00
Tim 53c281103c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-03-11 15:49:54 +08:00
Tim de3a4718ab 个人，课程，项目，组织访问量添加 2016-03-11 15:49:24 +08:00
cxt dcd13b9d6b 点击个人主页的课程和项目在新的tab页中打开 2016-03-11 11:34:16 +08:00
huang c947121e2b 消息不显示问题（未完） 2016-03-10 14:52:49 +08:00
ouyangxuhua f917e96a12 组织栏目中的链接的url更新 2016-03-10 12:47:10 +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