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

12072 Commits

Author SHA1 Message Date
huang e9b54ad012 删除附件的时候减掉得分 2016-01-14 16:04:59 +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
Tim 4493261797 自动生成文件 2016-01-14 15:59:24 +08:00
huang 01e8730b25 issue回复添加到积分统计 2016-01-14 15:52:14 +08:00
huang 286418b63c 修改课程讨论区500问题 2016-01-14 15:42:27 +08:00
cxt 26631e2199 关联项目的提交次数 2016-01-14 15:39:40 +08:00
cxt 0ffce929f4 项目讨论区的动态点赞 2016-01-14 15:22:37 +08:00
huang bcee2924bb Merge branch 'szzh' into develop 2016-01-14 15:11:01 +08:00
huang 6daa04b413 登录页面提示修改 2016-01-14 15:10:06 +08:00
ouyangxuhua 93570249c0 Merge branch 'dev_hjq' into szzh 2016-01-14 15:02:45 +08:00
huang 440be81587 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2016-01-14 15:02:30 +08:00
ouyangxuhua a21465343c 组织栏目编辑状态样式更新 2016-01-14 15:01:51 +08:00
huang e520a3dde2 Merge branch 'hjq_new_course' into develop 2016-01-14 15:00:43 +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
ouyangxuhua 307d382568 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 14:38:08 +08:00
huang 20a657508d Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/models/forge_activity.rb
	db/schema.rb
 2016-01-14 14:33:42 +08:00
huang 49d456bf21 修改数据统计信息 2016-01-14 14:32:19 +08:00
huang a68392fd24 issue统计数据更新 
提交次数加入新表
 2016-01-14 13:05:33 +08:00
huang 5fe4e9e813 创建项目的时候创建项目得分记录 2016-01-14 12:52:44 +08:00
ouyangxuhua d6e7a2ade5 解决一些bug 2016-01-14 12:51:01 +08:00
cxt c63af51001 项目动态数更新 2016-01-14 11:38:46 +08:00
huang e808f0bc61 提交新迁移 2016-01-14 11:37:10 +08:00
cxt 27617044a1 课程项目报500 2016-01-14 10:58:11 +08:00
ouyangxuhua 324513fc94 组织栏目子目录功能实现 2016-01-14 10:33:15 +08:00
cxt bf6f46174e 课程讨论区回复的点赞 2016-01-14 10:07:46 +08:00
huang 70cd068ea8 Merge branch 'develop' into hjq_new_course 2016-01-14 09:56:21 +08:00
cxt 90acb7816f 数据迁移 2016-01-14 09:38:00 +08:00
cxt fff7ab4993 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-13 19:17:02 +08:00
cxt 093574ebef 首页课程讨论区动态的点赞 2016-01-13 19:16:51 +08:00
cxt f7a88a63e0 更新项目缺陷动态的更新时间 2016-01-13 18:46:28 +08:00
cxt 0d2101bc30 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-13 18:42:37 +08:00
cxt 5c1ff1f6f7 关联项目时不显示已删除的项目 2016-01-13 18:42:25 +08:00
Tim 893e5dc7f3 针对课程370的精品课程样式设计 2016-01-13 18:33:22 +08:00
Tim 3d73a3c243 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-01-13 18:21:16 +08:00
Tim f0347c9166 精品课程图标 2016-01-13 18:16:19 +08:00
guange d935532f8d 课程讨论区at功能 2016-01-13 17:50:08 +08:00
cxt e889f798d7 项目创建动态报500 2016-01-13 17:26:36 +08:00
Tim d495f58408 切换分支文件 2016-01-13 17:13:39 +08:00
ouyangxuhua 582880e54d 设置课程/项目的公开私有属性，使用局部刷新 2016-01-13 16:59:48 +08:00
cxt 53a45908e9 关联项目的提交次数 2016-01-13 16:54:41 +08:00
Tim 88895ff262 英文文本强制折行修复 2016-01-13 16:36:34 +08:00
cxt efb5d05551 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-13 16:32:33 +08:00
cxt b73aab1cf6 课程讨论区的点赞 2016-01-13 16:32:05 +08:00
huang dd1ce752ab Merge branch 'develop' into hjq_new_course 2016-01-13 16:31:10 +08:00
huang 98f9da9b49 Merge branch 'szzh' into develop 2016-01-13 16:29:44 +08:00
huang 4b26e77478 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/models/issue.rb
	app/models/message.rb
	app/models/news.rb
处理冲突
 2016-01-13 16:28:00 +08:00
huang 34fde24f09 Merge branch 'hjq_new_course' into szzh 2016-01-13 16:25:56 +08:00
huang 8f989a962d 修改项目总分统计 2016-01-13 16:22:25 +08:00
ouyangxuhua 897eabd57a 修改快捷菜单权限问题及样式 2016-01-13 16:21:37 +08:00