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

529 Commits

Author SHA1 Message Date
guange 5f6a3cac04 wechat init 2016-01-16 11:54:59 +08:00
huang 64f972770f 添加board和attachment数据迁移 2016-01-15 10:41:34 +08:00
huang 20d550e755 提交次数默认值为空的数据处理 2016-01-14 21:25:36 +08:00
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-01-14 15:59:50 +08:00
huang 440be81587 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2016-01-14 15:02:30 +08:00
huang f3402e4fa4 项目得分新计算 2016-01-14 15:00:21 +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 a68392fd24 issue统计数据更新 
提交次数加入新表
 2016-01-14 13:05:33 +08:00
huang e808f0bc61 提交新迁移 2016-01-14 11:37:10 +08:00
cxt 90acb7816f 数据迁移 2016-01-14 09:38:00 +08:00
cxt f7a88a63e0 更新项目缺陷动态的更新时间 2016-01-13 18:46:28 +08:00
Tim d495f58408 切换分支文件 2016-01-13 17:13:39 +08:00
huang 05cf2d24dc 新项目积分系统 
讨论区回复加入得分系统
版本库行号显示错误问题
 2016-01-13 15:29:29 +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 a0ceb9b11c 添加缺陷回复统计 
项目版本库提交次数统计
 2016-01-13 12:53:09 +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 5d9ce929d9 组织栏目子目录 2016-01-13 09:34:33 +08:00
huang a74e5f9d30 添加项目动态数迁移 2016-01-12 15:18:40 +08:00
huang 8758235364 issue创建和删除的时候，issues_count+1 2016-01-12 15:10:02 +08:00
huang 1239a8b5af 统计数据迁移 2016-01-12 10:38:50 +08:00
ouyangxuhua 25a24f72e5 快捷菜单使用新的样式及链接 2016-01-11 16:44:52 +08:00
huang f3b732460c 添加项目统计字段 2016-01-11 14:57:52 +08:00
huang 580e4d7327 迁移问题 2016-01-08 18:55:17 +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 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
huang fd2197a73d 项目资源库历史数据迁移 
搜索功能添加Version类型判断
 2016-01-08 11:01:29 +08:00
ouyangxuhua e90a237a8a 2.1博客增加“设为主页”的功能 2016-01-07 15:09:09 +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 0a1aa9e569 Merge branch 'develop' into hjq_new_course 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-06 09:27:00 +08:00
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题； 
2.组织申请子域名功能。
 2016-01-05 16:46:06 +08:00
huang be218baa52 添加迁移：项目讨论区数据重复问题 2016-01-05 15:59:13 +08:00
huang 470f45becd 课程讨论区（未完） 2016-01-04 17:05:32 +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
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +08:00
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +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
ouyangxuhua e9cedf0eb9 删除冗余的迁移文件 2015-12-30 17:14:48 +08:00
ouyangxuhua d1ebc35e43 Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-12-30 10:37:28 +08:00
ouyangxuhua 40bf109223 给资源栏目增加board 2015-12-30 10:34:37 +08:00
lizanle 90c63192e6 历史资源模型修改 2015-12-30 10:32:32 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
ouyangxuhua 77e0f0cd08 转发帖子新建帖子，并更新相关表 2015-12-29 15:49:24 +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
cxt e86778a9c7 删除不存在的留言动态 2015-12-25 10:13:29 +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
ouyangxuhua 73d377d06d 组织资源栏目显示转发的帖子 2015-12-23 16:49:05 +08:00
ouyangxuhua b9ae579622 将课程帖子转发至组织帖子栏目 2015-12-23 15:35:26 +08:00