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

3873 Commits

Author SHA1 Message Date
huang 6ceb4f4549 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/models/course_contributor_score.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_homework_search_input.html.erb
	app/views/users/_show_user_homeworks.html.erb
	app/views/users/_user_homework_detail.html.erb
	app/views/users/_user_homework_form.html.erb
	app/views/users/user_homework_type.js.erb
	app/views/users/user_homeworks.html.erb
	app/views/users/user_homeworks.js.erb
 2016-03-05 03:17:47 +08:00
huang f381784a3c 数据迁移 2016-03-05 03:13:58 +08:00
huang 814e766577 课程过滤 2016-03-04 21:22:47 +08:00
cxt 782bbc775b 公共资源库的统计 2016-03-04 21:04:21 +08:00
huang de1c2e18c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 18:37:46 +08:00
huang ae40a4ea61 公共资源相关功能 2016-03-04 18:22:22 +08:00
huang bbbf13084e 修改搜索功能，页面跳转 2016-03-04 16:05:58 +08:00
cxt ffac8164f1 管理员的课程和项目列表，按照时间倒排 2016-03-04 15:55:45 +08:00
linchun bb8a6af13e admin界面添加精品课程页面，目前该页面中的精品课程是固定的 2016-03-04 15:31:40 +08:00
huang dfddb30ca3 附件引用 2016-03-04 14:21:39 +08:00
cxt 6ca702eb2c 题库发送的课程列表中不包含当前作业所在的课程 2016-03-04 13:18:43 +08:00
cxt 8aff404f0c 题库过滤作业的搜索 2016-03-04 11:37:14 +08:00
huang 50011985a9 课程资源库添加资源描述 2016-03-04 11:19:07 +08:00
cxt b333c40ce0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/public.css
 2016-03-04 11:11:25 +08:00
cxt e2ff348075 题库的作业过滤 2016-03-04 11:07:53 +08:00
cxt 0cd536fcc9 题库增加发布者姓名搜索 2016-03-04 10:34:04 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-03-04 09:33:38 +08:00
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/public.css
 2016-03-04 09:32:49 +08:00
huang 5ab9e3b5b7 资源搜索 
作业留言
 2016-03-04 09:29:20 +08:00
huang e9c9112b38 公共资源封装 2016-03-04 00:41:41 +08:00
guange 79004e1328 修改绑定流程 2016-03-03 23:27:05 +08:00
huang 8815e99db5 资源上传跳转问题 2016-03-03 17:25:52 +08:00
huang 5fd36c0e78 课程、项目、组织资源导入 2016-03-03 17:15:47 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 3368680e49 课程、项目、组织添加导入资源功能 2016-03-03 10:38:37 +08:00
huang 21244a5657 资源库导入功能 2016-03-02 17:46:10 +08:00
huang b3fea3e229 资源库代码封装 2016-03-02 11:30:19 +08:00
guange 697906509b 修改菜单 2016-03-01 17:58:54 +08:00
guange f53d9e19f7 修改菜单 2016-03-01 17:55:03 +08:00
guange 8e1624fafe 修改菜单 2016-03-01 17:33:48 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
guange 1b171e414c 修改菜单 2016-03-01 17:31:44 +08:00
guange b823413267 修改菜单 2016-03-01 17:16:48 +08:00
guange c33b35383d 修改菜单 2016-03-01 17:13:06 +08:00
guange d5e8945619 修改菜单 2016-03-01 17:06:40 +08:00
guange 509d4a3df7 绑定提交改为ajax 2016-03-01 16:56:37 +08:00
guange a59f65a455 wechat 2016-03-01 16:13:37 +08:00
guange e487b39d16 修改wechat配置 2016-03-01 15:46:05 +08:00
guange e32fdf6bcb 修改wechat配置 2016-03-01 15:21:20 +08:00
guange dce93c8313 修改wechat配置 2016-03-01 14:50:05 +08:00
guange 60b35a46ce 获取企业id 2016-03-01 14:05:18 +08:00
guange 35f9dc6e77 传request参数 2016-02-28 22:28:44 +08:00
guange 0ab579af98 订阅时发绑定信息 2016-02-28 22:22:10 +08:00
guange 15d5fe127e merge 2016-02-28 21:30:40 +08:00
guange a83cb2a1fa merge 2016-02-28 21:28:54 +08:00
huang 81f54e44b4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-26 19:25:36 +08:00
huang a10e973c75 版本库配置默认分支 2016-02-26 19:25:12 +08:00
ouyangxuhua 6e85b38b09 1.博客设为首页后转到个人主页；2.组织栏目设为首页正确实现文章 2016-02-26 17:11:18 +08:00
cxt 601c5906d4 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 17:00:29 +08:00
cxt 5b4cec2c05 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 16:26:51 +08:00
cxt e3e2c37f12 超级管理员的最近登录用户列表添加老师列表 2016-02-26 16:26:20 +08:00
ouyangxuhua 956ce8045d Merge branch 'ouyangxuhua' into develop 2016-02-26 16:18:17 +08:00
newuser 555a9131c4 Gitlab端获取默认分支 2016-02-26 15:37:59 +08:00
newuser d2bd4706d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-02-26 14:57:41 +08:00
newuser d747ec854d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 14:55:28 +08:00
cxt 09c8e57f1c 复制课程时可复制资源和作业 2016-02-26 10:41:14 +08:00
ouyangxuhua 991613d760 在转发表forwards记录发送帖子、通知 2016-02-25 16:22:42 +08:00
cxt c93b4d109a 作业动态添加子菜单：公开作品/取消公开 2016-02-25 16:18:24 +08:00
huang a6abdbacb9 Merge branch 'hjq_course' into hjq_new_course 2016-02-25 11:19:20 +08:00
huang 635e6300a1 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 
Conflicts:
	app/helpers/users_helper.rb
	app/views/users/_project_issue_detail.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
	db/schema.rb
 2016-02-25 11:17:54 +08:00
huang aef2dd8d1a 版本库通过修订好，导出对应的文件，导出对应内容 
高亮显示内容
内容修订对比 功能
 2016-02-25 11:06:10 +08:00
cxt c6e7e2e83b 模拟答题页面增加返回按钮，页面的layout改成课程相关 2016-02-25 10:23:38 +08:00
cxt 95170b0b2b Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-25 09:35:45 +08:00
guange 231df07c29 移除pry 2016-02-25 09:26:43 +08:00
ouyangxuhua a451680cf8 发送文件时，记录放在表forwards中 2016-02-24 17:09:43 +08:00
cxt e6ed988c10 Merge branch 'szzh' into develop 
Conflicts:
	db/schema.rb
 2016-02-24 17:00:08 +08:00
guange 296d6efbf1 单文件作业不压缩 2016-02-24 16:52:36 +08:00
cxt 070af9ad73 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-23 15:22:55 +08:00
cxt e4bf35a1b8 个人留言的回复不能自动刷新 2016-02-23 15:22:44 +08:00
huang 40fb140b6d 版本库提交记录diff信息 2016-02-23 15:09:15 +08:00
ouyangxuhua 4247ab4575 Merge branch 'ouyangxuhua' into develop 
Conflicts:
	db/schema.rb
 2016-02-23 13:36:05 +08:00
ouyangxuhua c91ef44570 组织子域名：所有子域名保存到secdomains表，将组织表中的子域名迁移到secdomains表中，并修改相应的代码 2016-02-23 12:52:04 +08:00
cxt b6bf78a5df 当天发布的资源显示未发布、日期选择器用中文 2016-02-23 11:35:07 +08:00
cxt a2e60944be 已发布资源的延期发布 2016-02-23 11:04:19 +08:00
cxt 98946b9855 课程上传资源弹框的延迟发布功能 2016-02-22 18:10:20 +08:00
cxt ba66425bef 学生打开分组作业列表报500 2016-02-20 18:26:52 +08:00
ouyangxuhua 1216f49ac2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/org_document_comments/edit.html.erb
 2016-02-20 16:59:58 +08:00
huang 3fda270a66 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-02-20 16:58:20 +08:00
ouyangxuhua a4ca676ccb Merge branch 'szzh' into ouyangxuhua 
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-02-20 16:49:19 +08:00
huang 212b37ef84 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 16:19:53 +08:00
huang a7470e059d 历史版本提供附件下载功能 2016-02-20 16:19:35 +08:00
ouyangxuhua fa08935f68 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/projects/settings/_new_repositories.html.erb
 2016-02-20 11:13:38 +08:00
huang 534d93de77 弹框位置调整 2016-02-20 10:59:49 +08:00
cxt 096320d04c 发布问卷时默认选中“允许学生查看调查结果” 2016-02-20 10:50:46 +08:00
guange b2551f904b 组织没有显示的问题 2016-02-04 12:51:23 +08:00
cxt 368e4cd14a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-02 15:51:49 +08:00
cxt 8b9bcb4719 导入题库的搜索不起作用 2016-02-01 10:04:07 +08:00
guange 71778ba948 拷贝课程图标 2016-01-29 22:10:04 +08:00
guange 724ff31751 Merge remote-tracking branch 'origin/szzh' into szzh 2016-01-29 21:16:27 +08:00
guange eb9232a087 at controller 的json应该登录 2016-01-29 21:15:23 +08:00
cxt ee73191a19 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 19:44:04 +08:00
cxt 1b5cdbe628 推荐的私有课程，点击“资源”返回403，点击“作业”也应该返回403 2016-01-29 19:41:47 +08:00
ouyangxuhua b7f1177938 1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新 2016-01-29 18:11:16 +08:00
Tim fa70e8a714 代码错误 2016-01-29 16:51:46 +08:00
cxt da81fb533e Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
cxt b5cf138f43 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
	db/schema.rb
 2016-01-29 15:44:26 +08:00
cxt d3ba23bc64 课程的作业列表增加搜索按钮 2016-01-29 15:37:03 +08:00
cxt e9a7f6f826 导出学生作业成绩列表 2016-01-29 11:02:57 +08:00
cxt c942c843b9 导入作业增加引用次数 2016-01-28 16:27:46 +08:00
cxt 8cc87c007f 导入作业添加作业类型 2016-01-28 09:51:05 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +08:00
ouyangxuhua 135cb410bc 1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突 2016-01-27 15:29:15 +08:00
guange d8ef2f0965 个人留言中的at启用 2016-01-26 18:24:15 +08:00
cxt 19003f27fc 课程添加is_copy属性 2016-01-26 15:05:45 +08:00
cxt 520811fdc7 留言按回复的更新时间排序 2016-01-26 11:17:55 +08:00
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +08:00
ouyangxuhua dda64245b3 解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。 2016-01-26 10:35:54 +08:00
cxt 945d0a933f 项目资源统计为负数 2016-01-25 17:34:04 +08:00
cxt 184e0ee689 管理员界面增加项目、组织、课程、用户、作业个数的显示 2016-01-25 16:50:34 +08:00
cxt b6e13340e5 个人留言的删除功能 2016-01-25 15:33:50 +08:00
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能 2016-01-25 14:19:39 +08:00
Tim a2afec77e3 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 
Conflicts:
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-01-25 11:32:55 +08:00
cxt 4465e93dae 最近登录报500 2016-01-25 10:16:33 +08:00
cxt 4530e7896a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 20:55:31 +08:00
cxt 8a2a1d2bc9 Merge branch 'szzh' into develop 2016-01-22 20:55:18 +08:00
cxt fc0b589760 Merge branch 'cxt_course' into szzh 2016-01-22 20:54:14 +08:00
cxt 3de8687440 留言页面的动态内容不生成链接，留言回复的样式更改 2016-01-22 20:11:49 +08:00
huang 19bb545993 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 18:49:28 +08:00
huang 16cb4add09 issue局部刷新属性问题 2016-01-22 18:48:40 +08:00
ouyangxuhua 26f8500671 博客回复后，该博客的更新时间为当前时间 2016-01-22 18:42:50 +08:00
ouyangxuhua 2d07801f52 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 18:10:50 +08:00
ouyangxuhua dbed8379d3 新建组织允许游客下载选项功能修复 2016-01-22 18:10:32 +08:00
huang 58b5dbdf9a 版本库最近一次提交时间存入数据库 
精品课程数据迁移
 2016-01-22 18:00:01 +08:00
huang e063470a57 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:30:07 +08:00
ouyangxuhua b5bfa6d824 1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。 2016-01-22 16:56:36 +08:00
ouyangxuhua b6219c149a 解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除； 2016-01-22 16:10:05 +08:00
ouyangxuhua b5159d54c8 博客按更新时间排序 2016-01-22 15:05:52 +08:00
huang edd198e91f issue刷新 2016-01-22 14:21:17 +08:00
ouyangxuhua 594ce8a304 修改几个bug 2016-01-21 16:57:13 +08:00
ouyangxuhua b6460633d2 个人博客按更新时间倒排 2016-01-21 16:15:45 +08:00
ouyangxuhua 600f5de32e 个人动态进入个人博客编辑后，跳转到个人首页 2016-01-21 16:11:06 +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 c303f7ff3f 将分享的js方法统一，分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
huang 7de48f143e issue状态修改 2016-01-21 10:38:07 +08:00
ouyangxuhua ece9f9dc6f 项目新闻使用方块样式 2016-01-21 10:33:53 +08:00
guange 769b044df5 动态内容调整 2016-01-20 23:39:47 +08:00
guange 745b8399d1 动态内容调整 2016-01-20 23:38:40 +08:00
guange 6075f44786 动态内容调整 2016-01-20 23:34:05 +08:00
guange 9d33dcf2f3 动态内容调整 2016-01-20 23:32:43 +08:00
guange 74b643584f 动态内容调整 2016-01-20 23:31:29 +08:00
guange 472c6acf2b 动态内容调整 2016-01-20 23:29:22 +08:00
guange 22a83bee0e 动态内容调整 2016-01-20 23:26:58 +08:00
guange c439d62a64 动态内容调整 2016-01-20 23:20:44 +08:00
guange 4607d1a78d 动态内容调整 2016-01-20 23:18:21 +08:00
guange 6d732ff5ff 动态内容调整 2016-01-20 23:17:17 +08:00
guange fce8d85380 动态内容调整 2016-01-20 23:15:22 +08:00
guange f644aa1144 图片调整 2016-01-20 22:31:36 +08:00
guange a72339fe2c 图片调整 2016-01-20 22:27:50 +08:00
guange 02cf9b56e1 图片调整 2016-01-20 22:25:14 +08:00
guange 27c2e9eddc 是否绑定修改 2016-01-20 22:05:19 +08:00
guange 3df2a8a3cc 添加适合微信图文的图片 2016-01-20 22:03:18 +08:00
guange 5831068fbd 添加适合微信图文的图片 2016-01-20 22:02:07 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +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
cxt fe0414c83f 组织文章和博客的点赞 2016-01-20 10:53:05 +08:00
cxt b64fc1771d 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-20 09:27:29 +08:00
ouyangxuhua d0c2eabddd 未登陆情况下，也能下载组织下的文件 2016-01-19 16:42:10 +08:00
cxt e293805488 点击在线问卷时若未登录则直接跳到登录页面 2016-01-19 15:41:53 +08:00
guange f39631169d 认证后回复消息 2016-01-19 15:29:03 +08:00
guange 7f5bb11a5f 认证后回复消息 2016-01-19 15:25:36 +08:00
guange 3a0f98ebea openid出错 2016-01-19 15:17:56 +08:00
guange f098e5358d openid出错 2016-01-19 15:12:00 +08:00
guange babf30af0a 界面优化 2016-01-19 15:06:40 +08:00
guange 527b695fab 绑定认证接口 bind 2016-01-19 14:46:16 +08:00
guange 0b1b8a4fcd 绑定认证接口 bind 2016-01-19 14:40:39 +08:00
guange 2681cc97dd 绑定用户前先录入用户资料 2016-01-19 14:39:31 +08:00
guange 80feca0c8c . 2016-01-19 14:32:22 +08:00
guange 8e66ab6a41 绑定认证接口 bind 2016-01-19 14:28:13 +08:00
guange 96d0b2e717 绑定用户事件 2016-01-19 14:07:59 +08:00
guange 40047ff818 添加菜单事件 2016-01-19 11:51:26 +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
cxt c5935a6a46 博客动态添加点赞 2016-01-18 15:52:38 +08:00
cxt 9cabb0248a 已点过赞的动态显示”已赞“ 2016-01-18 15:12:47 +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
guange b68eab23ea merge 2016-01-15 17:03:32 +08:00
guange 587d347178 added wechat 2016-01-15 17:01:30 +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
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
cxt 0be6e36020 缺陷、通知、个人留言动态的点赞 2016-01-14 21:07:05 +08:00
huang 9bbb1e0f90 修改fork时候项目ID问题 2016-01-14 20:48:12 +08:00
cxt 57cfe49602 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-14 18:08:19 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +08:00
cxt eb63ac59f2 作品提交不成功 2016-01-14 16:58:40 +08:00
cxt 58c96a0df0 作业动态的点赞 2016-01-14 16:15:40 +08:00
huang 440be81587 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2016-01-14 15:02:30 +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 5fe4e9e813 创建项目的时候创建项目得分记录 2016-01-14 12:52:44 +08:00
ouyangxuhua d6e7a2ade5 解决一些bug 2016-01-14 12:51:01 +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 5c1ff1f6f7 关联项目时不显示已删除的项目 2016-01-13 18:42:25 +08:00
guange d935532f8d 课程讨论区at功能 2016-01-13 17:50:08 +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
ouyangxuhua 897eabd57a 修改快捷菜单权限问题及样式 2016-01-13 16:21:37 +08:00
huang 7697dadbea 版本库统计次数刷新版本库的时候自动更新 2016-01-13 15:50:55 +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 64088f5a21 项目数据存入数据库（统计数据直接从数据库获取） 2016-01-13 10:08:48 +08:00
Tim 46217fb85d 切换分支后新出现文件 2016-01-13 10:02:43 +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 b48a2848b0 首页、课程、项目、组织动态增加更新时间 2016-01-12 15:53:15 +08:00
huang 83881766b2 提交总数接口获取修改 2016-01-12 11:01:58 +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 a3370b693c 课程关联组织列表为空 2016-01-08 21:46:10 +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
huang 64889fd14a 项目资源提供新分页 2016-01-08 20:10:43 +08:00
ouyangxuhua 5d819625c0 快捷菜单上传文件使用最新的上传方式 2016-01-08 20:09:57 +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
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
huang 57af22e3af 项目资源库tag增、删、改ajax 2016-01-08 16:30:04 +08:00
ouyangxuhua b2bad60b38 1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页 2016-01-08 16:16:57 +08:00
ouyangxuhua c500fc13db 解决组织动态中，第二页重复显示第一页动态的问题 2016-01-08 15:21:24 +08:00
ouyangxuhua 5eceb3d841 解决一些bug; 增加已设为首页标签 2016-01-08 14:42:21 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
huang fd2197a73d 项目资源库历史数据迁移 
搜索功能添加Version类型判断
 2016-01-08 11:01:29 +08:00
cxt 2aea4da310 导出的测验成绩列表添加”班级“ 2016-01-08 10:37:10 +08:00
guange 067f3be598 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 09:42:04 +08:00
guange 5ebfbc901a at排序按照拼音来 2016-01-08 09:41:12 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +08:00
cxt 05f822a5c2 导出在线测验成绩列表 2016-01-07 16:43:03 +08:00
cxt 2b75c1e11a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-07 15:29:38 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
ouyangxuhua e90a237a8a 2.1博客增加“设为主页”的功能 2016-01-07 15:09:09 +08:00
huang 8f7d5c8a35 项目资源库，上传资源类型，创建资源 2016-01-07 14:47:47 +08:00
huang 972f2bfea8 完成项目资源库tag云的查询统计 2016-01-07 10:31:22 +08:00
huang d0a8b4bc18 项目资源云搜索 2016-01-06 18:07:35 +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 c4718f992c 项目资源搜索 2016-01-06 11:05:52 +08:00
Tim 17800e8cf2 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-06 10:36:28 +08:00