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

982 Commits

Author SHA1 Message Date
huang dfb8a3afbf 数据迁移 2016-01-22 22:35:47 +08:00
cxt bbdced9bc1 留言页面的样式修改 2016-01-22 21:41:17 +08:00
huang 58b5dbdf9a 版本库最近一次提交时间存入数据库 
精品课程数据迁移
 2016-01-22 18:00:01 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
huang 2947ff8997 精品课程数据迁移 2016-01-22 16:46:23 +08:00
cxt f7be78efc7 关联项目的更新时间包含项目的提交时间 2016-01-22 11:10:35 +08:00
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_project_issue.html.erb
	db/schema.rb
 2016-01-21 16:10:29 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua bd99352ab1 组织增加是否允许游客下载的选项 2016-01-21 15:31:36 +08:00
ouyangxuhua 340d404ecd 组织栏目的通知增加查、改、删功能 2016-01-20 17:23:02 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course 
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
 2016-01-20 17:05:28 +08:00
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
Tim a3c30ee965 issue上传附件样式修改 2016-01-19 17:31:59 +08:00
huang b93b86b9a0 创建课程发送board 2016-01-18 17:16:33 +08:00
cxt 7f7d0ac6f7 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-18 17:12:56 +08:00
huang ef0a2a54c5 精品课程推荐 2016-01-18 15:48:26 +08:00
huang f52b0c1cc6 标记精品课程，精品课程推荐 2016-01-18 10:16:29 +08:00
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改 2016-01-18 10:13:31 +08:00
huang 8b815f95bb Merge branch 'develop' into hjq_new_course 2016-01-18 08:55:35 +08:00
huang ed26242f94 版本库提交次数迁移 2016-01-15 21:19:52 +08:00
huang 64f972770f 添加board和attachment数据迁移 2016-01-15 10:41:34 +08:00
huang 157502d450 精品课程 2016-01-15 10:35:56 +08:00
huang 20d550e755 提交次数默认值为空的数据处理 2016-01-14 21:25:36 +08:00
huang 09d2796ca7 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/new_user.css
处理冲突
 2016-01-14 17:35:25 +08:00
Tim 13e289dfb5 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/new_user.css
 2016-01-14 16:07:06 +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 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 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
cxt e889f798d7 项目创建动态报500 2016-01-13 17:26:36 +08:00
Tim d495f58408 切换分支文件 2016-01-13 17:13:39 +08:00
Tim 88895ff262 英文文本强制折行修复 2016-01-13 16:36:34 +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 cf7130a398 0 2016-01-13 12:57:09 +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
cxt 7c376ed60b 数据迁移 2016-01-08 19:15:47 +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 d574521b48 样式更新 2016-01-08 18:03:12 +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
huang 11444f43f0 解决issue多附件，删除一个附件后，提交弹出白色框框的问题 2015-12-31 17:55:48 +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
lizanle b059ab2428 schema.rb 2015-12-31 11:13:44 +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 d1c7aad742 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-30 10:36:00 +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
huang 41cd038758 讨论区帖子添加锁定 2015-12-29 15:05:07 +08:00
ouyangxuhua 0d98dba25c 解决项目新建帖子中，点击取消按钮没有反应的问题 2015-12-29 09:53:44 +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
ouyangxuhua 2220e0b7cc 增加帖子-组织栏目关联表 2015-12-22 15:48:41 +08:00
houxiang 3e57237969 修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔 2015-12-21 16:21:39 +08:00
houxiang e8511a6210 modify the gemfile conflict by hx 2015-12-21 16:00:35 +08:00
huang dae6e68623 renwu 2015-12-18 20:46:17 +08:00
huang 747493993b 上线测试 2015-12-18 19:57:08 +08:00
cxt 4d82beb4c7 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 16:27:19 +08:00
lizanle 793a98ade1 forge_activities那个运行批量删除回复动态脚本改动 2015-12-18 15:51:41 +08:00
cxt c6e7c8860d dd 2015-12-18 15:45:23 +08:00
lizanle 70f93741d6 issue图标问题 2015-12-18 14:38:04 +08:00
lizanle bba40de36d journal不应该算入ForgeActivity，历史数据应该删除 2015-12-18 10:48:13 +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 b87943ff1d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-18 09:17:18 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
guange fc63dfcb7b 消息通知 2015-12-17 15:14:52 +08:00
huang 721a007779 删除 由于course、project一张表而引起的历史数据异常问题 2015-12-17 13:22:41 +08:00
lizanle 71f6a637e0 帖子按时间倒排 2015-12-16 17:26:19 +08:00
guange c0de5d55de 加入了issue的at消息提醒 2015-12-16 16:37:00 +08:00
cxt 5cf88a287b 分组作业提示语的修改 2015-12-16 11:37:59 +08:00
huang 41bb37d6d4 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb

解决冲突
 2015-12-16 10:02:08 +08:00
huang 06e5784436 解决英雄榜两个用户同时存在的but 2015-12-16 10:00:10 +08:00
cxt 481b7b96eb 正式版报500 2015-12-15 20:15:10 +08:00
cxt 699d0e22dd 删除多余学生的测验数据 2015-12-15 19:05:19 +08:00
ouyangxuhua 0602a03e12 组织资源类型的栏目，增加搜索功能 2015-12-14 10:26:34 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2015-12-11 15:00:35 +08:00
cxt 27ed6df9d6 Merge branch 'szzh' into develop 2015-12-11 14:59:52 +08:00
huang fed989753a 修复林处账号不能查看消息的问题 2015-12-11 13:46:23 +08:00
huang 9710731a2c 课程配置添加登录名 2015-12-10 20:03:59 +08:00
huang fbba933a46 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-10 16:09:42 +08:00
huang be940ee3aa Merge branch 'develop' into hjq_new_course 2015-12-10 16:09:36 +08:00
ouyangxuhua 1e652faec7 Merge branch 'develop' into dev_hjq 2015-12-10 10:55:59 +08:00
lizanle 433059e1bc schema 2015-12-10 10:12:54 +08:00
ouyangxuhua 2f7260cba2 1.在栏目表中增加field_type(类型)字段； 
2.在组织配置-》栏目，增加栏目类型。
 2015-12-09 17:24:59 +08:00
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能 2015-12-09 09:23:22 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
huang ac9f13c842 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 
Conflicts:
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 17:13:50 +08:00
huang 916d99be82 课程删除功能 2015-12-08 16:45:26 +08:00
houxiang 56cb83ffba 版本库首页没有统计commit_count，具体的详情页在开始统计 2015-12-08 15:56:31 +08:00
huang 42f5b86d95 添加字段删除课程 2015-12-08 10:32:10 +08:00
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 
Conflicts:
	app/views/courses/member.html.erb
	app/views/courses/settings.html.erb
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 09:10:21 +08:00
cxt b61a0a98e5 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/student_work/new.html.erb
	app/views/users/_user_homework_form.html.erb
	db/schema.rb
	public/stylesheets/courses.css
 2015-12-07 09:47:18 +08:00
huang bd3d0547f5 组织样式修改 2015-12-05 14:34:16 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle 2015-12-04 16:42:02 +08:00
lizanle 0a5a33c2de schema 2015-12-04 16:36:03 +08:00
huang 4d0956dff1 Merge branch 'develop' into gitlab_guange 2015-12-04 15:54:56 +08:00
huang 9f73807e05 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-04 15:54:18 +08:00
huang c1747ab217 fork重名，提交 2015-12-04 15:49:05 +08:00
huang 8f024bdf4d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
 2015-12-04 09:12:24 +08:00
huang 89b8f7783d 添加forked_form的id 2015-12-04 08:57:29 +08:00
cxt fd51b02e16 添加修订附件 2015-12-03 18:33:08 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
cxt f90ff781ab 学生提交作品页面的合作成员弹窗 2015-12-03 09:17:36 +08:00
cxt fee438cc0b Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-30 16:27:39 +08:00
cxt ebeaac5798 作业匿评的结束状态未更新 2015-11-30 16:27:26 +08:00
ouyangxuhua 6f9c89d67b 1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能； 
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
 2015-11-30 16:04:43 +08:00
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
合并
 2015-11-30 14:35:37 +08:00
huang 39b87aaaac 为student_work表添加索引 
为homework_comments添加索引
大幅提高查询速度
 2015-11-30 13:09:13 +08:00
lizanle d266237590 kaminari分页添加上一页下一页 2015-11-30 11:08:08 +08:00
lizanle 3c946c034a Merge branch 'szzh' into dev_zanle 
Conflicts:
	db/schema.rb
	kaminari分页添加上一页下一页
 2015-11-30 11:07:53 +08:00
lizanle 885215fb8f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-30 10:45:50 +08:00
lizanle 96290ad975 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:19 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:02 +08:00