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

9962 Commits

Author SHA1 Message Date
cxt b4521d3582 课程/项目首页的更多默认收起 2016-01-18 16:18:40 +08:00
cxt c5935a6a46 博客动态添加点赞 2016-01-18 15:52:38 +08:00
huang ef0a2a54c5 精品课程推荐 2016-01-18 15:48:26 +08:00
cxt 9cabb0248a 已点过赞的动态显示”已赞“ 2016-01-18 15:12:47 +08:00
ouyangxuhua 5e102d24dd 解决个人博客报500的问题 2016-01-18 11:01:04 +08:00
ouyangxuhua f796aa1489 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-18 10:54:17 +08:00
ouyangxuhua 03df9abfeb 增加域名唯一性判断 2016-01-18 10:43:22 +08:00
huang f52b0c1cc6 标记精品课程，精品课程推荐 2016-01-18 10:16:29 +08:00
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改 2016-01-18 10:13:31 +08:00
ouyangxuhua c6aaaff8d1 对有子域名的组织，栏目的链接应不含有组织及其id 2016-01-18 10:07:12 +08:00
huang 8b815f95bb Merge branch 'develop' into hjq_new_course 2016-01-18 08:55:35 +08:00
huang b2746d0953 课程讨论区总数计入回复数 2016-01-15 16:30:17 +08:00
huang f52e74da61 修改issues总数读取方式 2016-01-15 16:11:26 +08:00
huang eecdc26b2f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 15:42:36 +08:00
huang 86516df88a Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/helpers/application_helper.rb
 2016-01-15 15:41:02 +08:00
huang c936304314 课程默认收起 2016-01-15 15:37:17 +08:00
ouyangxuhua b9359b1cee 显示url申请 2016-01-15 13:15:17 +08:00
huang b6ae14a1ce 课程更多字体12 2016-01-15 12:51:50 +08:00
huang 81b32ea643 点击铃铛弹出新tab页 2016-01-15 12:39:38 +08:00
huang 157502d450 精品课程 2016-01-15 10:35:56 +08:00
cxt 902cfdcbe9 课程/项目的创建动态不需要显示更新时间 2016-01-15 10:29:55 +08:00
cxt c49a290d56 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 10:24:37 +08:00
ouyangxuhua 16a3a7d06d 隐藏url定制 2016-01-14 21:42:28 +08:00
ouyangxuhua def640cd31 Merge branch 'dev_hjq' into develop 2016-01-14 21:31:29 +08:00
ouyangxuhua 7ad377f458 修改一些bug 2016-01-14 21:29:43 +08:00
cxt 0be6e36020 缺陷、通知、个人留言动态的点赞 2016-01-14 21:07:05 +08:00
huang 9bbb1e0f90 修改fork时候项目ID问题 2016-01-14 20:48:12 +08:00
ouyangxuhua 5097f19ec8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/layouts/_user_projects.html.erb
	app/views/projects/set_public_or_private.js.erb
 2016-01-14 18:30:05 +08:00
ouyangxuhua 1c62edbed4 项目设为私有title更新 2016-01-14 18:26:36 +08:00
huang a114b7525d Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-14 18:25:56 +08:00
huang b3e6f6acd5 项目删除附件问题 
项目得分添加讨论回复计算
 2016-01-14 18:25:42 +08:00
cxt 894c97304c 冲突 2016-01-14 18:24:07 +08:00
cxt 25cc959576 Merge branch 'szzh' into develop 
Conflicts:
	app/views/layouts/_user_courses.html.erb
	app/views/org_subfields/show.html.erb
	app/views/organizations/_subfield_list.html.erb
	app/views/users/_resource_share_for_orgs.html.erb
 2016-01-14 18:22:57 +08:00
cxt 57cfe49602 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 18:08:19 +08:00
cxt cef9fd96cd 组织帖子的动态点赞 2016-01-14 18:05:58 +08:00
ouyangxuhua 0f0f1ae056 Merge branch 'dev_hjq' into szzh 
Conflicts:
	db/schema.rb
 2016-01-14 17:54:16 +08:00
ouyangxuhua 276b07df8a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 17:53:22 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +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
huang a105ed6e00 项目得分弹出分类显示 2016-01-14 17:29:55 +08:00
cxt 7b4b575240 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 16:58:51 +08:00
cxt eb63ac59f2 作品提交不成功 2016-01-14 16:58:40 +08:00
cxt 58c96a0df0 作业动态的点赞 2016-01-14 16:15:40 +08:00
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
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 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 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 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
cxt 093574ebef 首页课程讨论区动态的点赞 2016-01-13 19:16:51 +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
guange d935532f8d 课程讨论区at功能 2016-01-13 17:50:08 +08:00
cxt e889f798d7 项目创建动态报500 2016-01-13 17:26:36 +08:00
ouyangxuhua 582880e54d 设置课程/项目的公开私有属性，使用局部刷新 2016-01-13 16:59:48 +08:00
cxt 53a45908e9 关联项目的提交次数 2016-01-13 16:54:41 +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 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 8f989a962d 修改项目总分统计 2016-01-13 16:22:25 +08:00
ouyangxuhua 897eabd57a 修改快捷菜单权限问题及样式 2016-01-13 16:21:37 +08:00
huang 24df6d30d6 项目得分弹出页面 2016-01-13 16:15:46 +08:00
huang 7697dadbea 版本库统计次数刷新版本库的时候自动更新 2016-01-13 15:50:55 +08:00
huang 05cf2d24dc 新项目积分系统 
讨论区回复加入得分系统
版本库行号显示错误问题
 2016-01-13 15:29:29 +08:00
ouyangxuhua 6cfda615d6 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +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
huang 5519ef78e2 项目新闻、项目讨论区区分project和course 2016-01-13 10:18:19 +08:00
huang 64088f5a21 项目数据存入数据库（统计数据直接从数据库获取） 2016-01-13 10:08:48 +08:00
cxt f320af53dc Merge branch 'cxt_course' into szzh 2016-01-13 10:05:48 +08:00
cxt e04926f2e7 关联项目的提交次数 2016-01-13 10:04:42 +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 8ead573872 组织设置url 2016-01-13 09:56:24 +08:00
ouyangxuhua 5d9ce929d9 组织栏目子目录 2016-01-13 09:34:33 +08:00
ouyangxuhua d5fc0277a2 3.2组织资源的样式更新 2016-01-12 16:43:40 +08:00
cxt 96a28fe5b5 博客动态添加更新时间 2016-01-12 16:13:49 +08:00
cxt b48a2848b0 首页、课程、项目、组织动态增加更新时间 2016-01-12 15:53:15 +08:00
huang 8758235364 issue创建和删除的时候，issues_count+1 2016-01-12 15:10:02 +08:00
huang 83881766b2 提交总数接口获取修改 2016-01-12 11:01:58 +08:00
huang 1239a8b5af 统计数据迁移 2016-01-12 10:38:50 +08:00
ouyangxuhua 48f931deba 隐藏组织的课程/项目快捷菜单 2016-01-11 17:02:01 +08:00
ouyangxuhua 2f5ada2d7b 博客设为首页后，显示在个人主页处 2016-01-11 16:56:57 +08:00
ouyangxuhua 25a24f72e5 快捷菜单使用新的样式及链接 2016-01-11 16:44:52 +08:00
huang f3b732460c 添加项目统计字段 2016-01-11 14:57:52 +08:00
cxt a93539da5e 课程学期往前推一个学期 2016-01-11 11:07:03 +08:00
huang 525d1544c2 代码样式 2016-01-11 10:43:48 +08:00
cxt a3a16b5591 问题跟踪、作业列表页面“展开更多”改为“点击展开更多” 2016-01-11 10:21:42 +08:00
guange e80149c6c8 @7008找不到的问题 2016-01-10 15:38:45 +08:00
huang 28c3dca099 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 22:30:48 +08:00
cxt 66c3cee3f8 课程关联组织列表 2016-01-08 22:30:04 +08:00
huang c719fd96a3 0 2016-01-08 22:29:57 +08:00
cxt bb0a03b309 若无任何个人留言，或者当前用户无权限看到任何个人留言，不要显示白框 2016-01-08 22:02:35 +08:00
huang 8c10ce6fee 修改组织500问题 2016-01-08 21:47:42 +08:00
cxt a3370b693c 课程关联组织列表为空 2016-01-08 21:46:10 +08:00
cxt eab8cc7231 复制学期的默认图片 2016-01-08 21:22:36 +08:00
huang f9bc1efd7c issue编辑的时候ajax刷新附件 2016-01-08 21:18:08 +08:00
huang 3df542ff6a Merge branch 'szzh' into develop 2016-01-08 20:46:06 +08:00
cxt cc135503c2 Merge branch 'cxt_course' into szzh 2016-01-08 20:36:08 +08:00
cxt 1264d5f6ca Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 20:35:19 +08:00
cxt 9368e3875c 去掉关联项目的提交次数 2016-01-08 20:35:05 +08:00
cxt 75e2eecc37 课程配置中点击开课学期或结束学期弹框中，“复制学期”入口要开通 2016-01-08 20:23:27 +08:00
huang 64889fd14a 项目资源提供新分页 2016-01-08 20:10:43 +08:00
ouyangxuhua 5d819625c0 快捷菜单上传文件使用最新的上传方式 2016-01-08 20:09:57 +08:00
ouyangxuhua 0ac99571de 样式调整 2016-01-08 19:50:17 +08:00
cxt ef441d3bca 关联项目样式修改 2016-01-08 19:43:37 +08:00
ouyangxuhua 3a62db6475 Merge branch 'dev_hjq' into szzh 2016-01-08 19:34:36 +08:00
ouyangxuhua ceeec3af12 修改一些bug 2016-01-08 19:33:58 +08:00
cxt 5dbad5a672 已关联项目的样式修改 2016-01-08 19:04:22 +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 626e3da1e6 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-08 18:09:21 +08:00
huang 762ebb150b 解决课程资源重复分页问题 2016-01-08 18:09:11 +08:00
cxt 90f6f07f19 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 18:06:28 +08:00
huang 0ab500986a 发送搜索功能 2016-01-08 18:03:59 +08:00
cxt f1e9718f56 隐藏复制学期的上传图片按钮 2016-01-08 18:03:17 +08:00
ouyangxuhua d574521b48 样式更新 2016-01-08 18:03:12 +08:00
ouyangxuhua 09b8373e12 组织配置https改成http 2016-01-08 17:13:34 +08:00
ouyangxuhua 7f465d1766 修改bug 2016-01-08 17:12:19 +08:00
huang dc90976497 项目资源库添加 “发送”功能 2016-01-08 17:09:32 +08:00
huang 57af22e3af 项目资源库tag增、删、改ajax 2016-01-08 16:30:04 +08:00
cxt 17aeff1587 复制学期时密码修改无效 2016-01-08 16:20:14 +08:00
ouyangxuhua b2bad60b38 1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页 2016-01-08 16:16:57 +08:00
cxt a0afe6ccbf 动态显示附件并统一附件样式 2016-01-08 16:05:36 +08:00
ouyangxuhua c500fc13db 解决组织动态中，第二页重复显示第一页动态的问题 2016-01-08 15:21:24 +08:00
cxt c5a10c504e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-08 14:53:20 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
huang 6a9ebb572b 资源库添加上传按钮 2016-01-08 14:51:47 +08:00
huang 6a9dc43d03 版权修改、issue编辑 2016-01-08 14:42:28 +08:00
ouyangxuhua 5eceb3d841 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
huang dd4d687559 修改项目资源附件统计功能 2016-01-08 11:11:11 +08:00
huang fd2197a73d 项目资源库历史数据迁移 
搜索功能添加Version类型判断
 2016-01-08 11:01:29 +08:00
Tim 125479f671 课程复制样式调整 2016-01-08 10:49:02 +08:00
cxt 2aea4da310 导出的测验成绩列表添加”班级“ 2016-01-08 10:37:10 +08:00