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

10270 Commits

Author SHA1 Message Date
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
Tim f099611d7a 问题跟踪样式更改 2016-01-25 11:25:43 +08:00
cxt 12f55f039c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-25 10:16:43 +08:00
cxt 4465e93dae 最近登录报500 2016-01-25 10:16:33 +08:00
huang 154417378e 精品课程默认推荐 2016-01-24 10:58:58 +08:00
huang 49d0d214de 精品课程默认排序 2016-01-24 08:48:38 +08:00
cxt d386b2ff84 留言页面的“展开更多” 2016-01-22 22:37:47 +08:00
cxt 435f81a422 关联项目的更新时间 2016-01-22 21:47:59 +08:00
cxt bbdced9bc1 留言页面的样式修改 2016-01-22 21:41:17 +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
huang b3caa01540 修改课程作业链接 2016-01-22 20:45:25 +08:00
huang 655cc0d2db issue截止时间邮件通知 2016-01-22 20:26:44 +08:00
cxt 3de8687440 留言页面的动态内容不生成链接，留言回复的样式更改 2016-01-22 20:11:49 +08:00
huang 29c49fbb0c Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 20:03:13 +08:00
huang f2d93c0b72 修改issue编辑权限 2016-01-22 20:02:18 +08:00
ouyangxuhua 4b183c2928 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 19:50:01 +08:00
ouyangxuhua afad062b80 设置资源栏目、项目资源、课程资源的title,不显示Files 2016-01-22 19:49:05 +08:00
huang 007afa8c4f issue在动态中回复自动刷新 2016-01-22 19:34:02 +08:00
huang 19bb545993 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 18:49:28 +08:00
cxt c4a264f8a6 提交作品时的附件显示 2016-01-22 18:48:50 +08:00
huang 16cb4add09 issue局部刷新属性问题 2016-01-22 18:48:40 +08:00
ouyangxuhua 26f8500671 博客回复后，该博客的更新时间为当前时间 2016-01-22 18:42:50 +08:00
cxt 6ae7da99be 帖子、博客、通知、文章详情页面的单词折行 2016-01-22 18:33:43 +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
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
cxt a96d8ce5a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:29:29 +08:00
huang faf1fcaf22 issue回复局部刷新 
附件浏览问题
昵称改成登录名
 2016-01-22 17:27:21 +08:00
cxt 0b2184c3d9 组织栏目的通知附件显示 2016-01-22 17:16:24 +08:00
ouyangxuhua d4c3cb8777 Merge branch 'develop' into dev_hjq 2016-01-22 17:13:46 +08:00
ouyangxuhua 0a9ecac3db 帖子栏目讨论区链接问题修复 2016-01-22 17:12:59 +08:00
cxt e09f795171 附件的显示 2016-01-22 17:05:58 +08:00
ouyangxuhua b5bfa6d824 1.组织配置中，允许游客下载格式对齐；2.新建组织中，允许游客下载选项生效。 2016-01-22 16:56:36 +08:00
huang 2947ff8997 精品课程数据迁移 2016-01-22 16:46:23 +08:00
ouyangxuhua b6219c149a 解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除； 2016-01-22 16:10:05 +08:00
cxt 338c224846 课程配置页面的结束学期可修改 2016-01-22 15:17:11 +08:00
ouyangxuhua b5159d54c8 博客按更新时间排序 2016-01-22 15:05:52 +08:00
huang edd198e91f issue刷新 2016-01-22 14:21:17 +08:00
cxt f7be78efc7 关联项目的更新时间包含项目的提交时间 2016-01-22 11:10:35 +08:00
ouyangxuhua d7b17b455d Merge branch 'szzh' into develop 2016-01-22 10:27:32 +08:00
cxt 6789693fc7 已评分作品超过5个时，作业优秀作品排行显示“更多” 2016-01-22 10:17:00 +08:00
huang 4f7d4bb4aa Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-01-22 09:58:08 +08:00
huang e871c6823f Merge branch 'develop' into hjq_new_course 2016-01-22 09:57:45 +08:00
huang 59aa1e9c6f issue截止修改 2016-01-22 09:55:58 +08:00
ouyangxuhua a15f7fa97b 系统管理员增加组织管理员的权限 2016-01-22 09:54:20 +08:00
cxt fea4f79dc8 组织帖子栏目的通知增加点赞tip 2016-01-22 09:47:18 +08:00
ouyangxuhua 8ef3018adc issue局部刷新使用update,方式是put 2016-01-22 09:41:05 +08:00
huang 42cc8bc69e issue属性刷新 2016-01-22 09:30:52 +08:00
huang 448a412abf issue详情页面在 user动态、project动态中修改 2016-01-21 17:29:46 +08:00
ouyangxuhua 594ce8a304 修改几个bug 2016-01-21 16:57:13 +08:00
ouyangxuhua b6460633d2 个人博客按更新时间倒排 2016-01-21 16:15:45 +08:00
huang e2fc88e3d1 课程讨论区样式混乱的问题 2016-01-21 16:14:39 +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
huang 0ba724776e 项目版本库左侧添加提交次数统计 2016-01-21 16:06:50 +08:00
huang 56e804b423 issue邮件name问题 2016-01-21 15:52:07 +08:00
huang ff475fb00b Merge branch 'szzh' into develop 2016-01-21 15:35:38 +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
cxt 65563e6503 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-21 15:24:40 +08:00
cxt 99cda66d00 编程作业：每次提交了测试集后，页面都会跳到作业页面的最底端，还得手动翻到页面最顶端，再点“发送” 2016-01-21 15:02:12 +08:00
ouyangxuhua 6b44b93f0e 在通知详情页面，也有发送按钮 2016-01-21 14:54:20 +08:00
cxt 5672b029fe 导入作业加提示语 2016-01-21 14:50:16 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一，分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
huang 524e152b24 Issue截止时间到了邮件提醒 2016-01-21 11:19:08 +08:00
huang 7de48f143e issue状态修改 2016-01-21 10:38:07 +08:00
cxt f15847371c 附件显示过长 2016-01-21 10:36:30 +08:00
ouyangxuhua ece9f9dc6f 项目新闻使用方块样式 2016-01-21 10:33:53 +08:00
cxt 1ff244ad98 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 18:38:00 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +08:00
huang c7522067e6 修改base界面 2016-01-20 18:37:39 +08:00
huang 01016c67a9 issue属性局部刷新 2016-01-20 18:28:27 +08:00
Tim c7edf0d73b 弹框样式修改 2016-01-20 17:55:20 +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
huang f3b5f4e5f7 修改浏览器tab页通过不同的模块展示不同内容 2016-01-20 16:58:41 +08:00
huang 0db69e1ebf 解决课程导语时间和课程创建动态时间一致的问题 2016-01-20 16:32:47 +08:00
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
huang c5d935108e 完成课程按tag搜索推荐 2016-01-20 15:59:30 +08:00
huang 18c3c23d2c 课程推荐 2016-01-20 15:43:33 +08:00
cxt fe0414c83f 组织文章和博客的点赞 2016-01-20 10:53:05 +08:00
cxt 945ed84276 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 09:27:38 +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 18e79ba9b3 未登陆情况下，可以看到组织文章列表及首页全部内容 2016-01-20 09:25:12 +08:00
Tim a3c30ee965 issue上传附件样式修改 2016-01-19 17:31:59 +08:00
ouyangxuhua e70e1beb5d Merge branch 'szzh' into dev_hjq 2016-01-19 16:59:04 +08:00
ouyangxuhua 7acfc22ee1 未登陆情况下，访问组织栏目增加margin-top:10px,已使样式正常 2016-01-19 16:58:15 +08:00
cxt 6e56a0706a 动态描述中的单词折行 2016-01-19 16:53:34 +08:00
ouyangxuhua d0c2eabddd 未登陆情况下，也能下载组织下的文件 2016-01-19 16:42:10 +08:00
cxt e293805488 点击在线问卷时若未登录则直接跳到登录页面 2016-01-19 15:41:53 +08:00
huang 610b54b27c 课程导语放置课程动态之后 2016-01-19 10:29:57 +08:00
cxt 8e9c4bab6b 赞增加tip 2016-01-19 10:08:28 +08:00
cxt 6e582fa631 老师评阅作品时可以不写评语，只有学生匿评的时候才强制写评语 2016-01-19 09:55:28 +08:00
huang 5862c16c68 完成精品课程推荐 
过滤掉私有课程
过滤掉已删除的课程
 2016-01-18 17:36:18 +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 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
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 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
ouyangxuhua 9e286ef8a5 对于当前用户，鼠标经过该用户头像显示详细信息时，有编辑资料按钮 2016-01-08 10:11:47 +08:00
cxt 2d73933f4f 已经删除了的课程还显示在新建作业的发布课程列表中 2016-01-08 09:46:07 +08:00
guange 067f3be598 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-08 09:42:04 +08:00
ouyangxuhua 178f9e167c 1.申请子域名时，对子域名进行规范，仅能输入字母、数字和下划线； 
2.博客主页，添加取消主页按钮；
3.私信只能发送者和接收者能看到
 2016-01-08 09:41:56 +08:00
guange 5ebfbc901a at排序按照拼音来 2016-01-08 09:41:12 +08:00
cxt 2de42afdae 开启匿评的提示信息修改 2016-01-08 09:09:57 +08:00
cxt 5e0ee0426a 作业动态的附件放在扣分上面 2016-01-07 17:23:32 +08:00
huang e56382a899 tag云ajax更新后自动刷新 2016-01-07 17:15:19 +08:00
cxt 05f822a5c2 导出在线测验成绩列表 2016-01-07 16:43:03 +08:00
ouyangxuhua 539d971901 组织页面也增加项目/课程快捷菜单 2016-01-07 16:37:41 +08:00
cxt 5b234580a8 学生作品列表打开报500 2016-01-07 15:59:51 +08:00
ouyangxuhua e763a7a8ca 课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等 2016-01-07 15:58:22 +08:00
cxt 1263e4cac0 关联项目的样式修改 2016-01-07 15:33:21 +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
ouyangxuhua 80668d6a47 增加以下功能： 
鼠标经过用户头像时，显示用户的详细信息，并且可以添加/取消关注，可以私信/留言。
 2016-01-07 10:10:24 +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
huang b4617e431f 代码格式 2016-01-06 16:22:25 +08:00
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能； 
2.增加私信功能
 2016-01-06 16:22:13 +08:00
huang 9464495c19 资源搜索 
资源公开私有ajax
 2016-01-06 15:58:22 +08:00
huang c4718f992c 项目资源搜索 2016-01-06 11:05:52 +08:00
Tim e9d986b311 课程关联项目样式调整 2016-01-06 11:01:00 +08:00
cxt cf125159f2 关联项目增加提交次数 2016-01-06 10:36:53 +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
cxt d4d96e66fc Merge branch 'develop' into cxt_course 2016-01-06 10:03:21 +08:00
cxt 244e133803 关联项目的对齐 2016-01-06 09:57:54 +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
huang 7ee4ff69b3 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-05 17:03:10 +08:00
huang fc55be78c6 博客列表展开/ 2016-01-05 17:01:41 +08:00
huang 738acad211 展开、收缩 2016-01-05 16:52:34 +08:00
cxt 9ccca401f6 匿评时也显示系统测试情况 2016-01-05 16:47:55 +08:00
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题； 
2.组织申请子域名功能。
 2016-01-05 16:46:06 +08:00
huang 2efcb5b89a 课程讨论区添加展开、收缩 2016-01-05 16:05:27 +08:00
huang be218baa52 添加迁移：项目讨论区数据重复问题 2016-01-05 15:59:13 +08:00
cxt 0a2d2a539f 关联项目的组长名字加个title 2016-01-05 15:46:41 +08:00
huang 428eb018a3 隐藏注册中“组织一列” 2016-01-05 15:02:39 +08:00
huang 1f09817e4d 增加课程讨论区/项目讨论展开更多功能 
博客列表页面展开更多
统一展开高度为一个屏幕
 2016-01-05 12:59:59 +08:00
cxt f52dc37a76 作业动态添加作品评阅和作品提交消息 2016-01-05 11:29:30 +08:00
huang 680e861620 项目资源搜索功能 2016-01-05 11:00:26 +08:00
huang 81bb35ac49 项目资源库 资源列表 2016-01-05 10:01:56 +08:00
huang 0d6ad9ffac 修改课程删除后可以显示的问题 2016-01-04 17:08:15 +08:00
huang 470f45becd 课程讨论区（未完） 2016-01-04 17:05:32 +08:00
ouyangxuhua abf6b5ff70 解决base_org上传资源按钮不能正常上传的问题 2016-01-04 15:36:02 +08:00
ouyangxuhua 8dd34f91c3 课程/项目配置关联组织，仅关联用户的组织 2016-01-04 15:12:38 +08:00
huang b79a50ce2f issue回复添加附件 2016-01-04 12:33:43 +08:00
cxt 3ddbeae100 课程的“更多”模式的文字不用粗体 2016-01-04 11:32:48 +08:00
ouyangxuhua dae07d7e92 解决组织页面对齐的问题 2016-01-04 11:11:42 +08:00
huang 9e87e63b82 系统消息去掉附件 2016-01-04 10:36:27 +08:00
huang 3394af7ad5 Merge branch 'develop' into hjq_new_course 2016-01-04 10:29:13 +08:00
cxt 7f751cfc63 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-31 17:58:59 +08:00
huang 11444f43f0 解决issue多附件，删除一个附件后，提交弹出白色框框的问题 2015-12-31 17:55:48 +08:00
cxt 6b5341805e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-31 17:54:04 +08:00
cxt f0216cf604 Merge branch 'cxt_course' into szzh 2015-12-31 17:53:52 +08:00
cxt 3dac8d2944 课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限 2015-12-31 17:53:05 +08:00
huang 0541294c33 为解决完： 
1、user_message_system附件显示问题
2、issue回复添加附件问题
 2015-12-31 17:08:27 +08:00
lizanle 87b8e4dafc Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-31 17:07:04 +08:00
lizanle b06bd51347 项目资源库更新资源公开私有属性的时候 需要区分 项目课程 2015-12-31 17:06:49 +08:00
ouyangxuhua 527897bff0 新建组织后，增加默认栏目 2015-12-31 16:23:10 +08:00
ouyangxuhua 692f13d1de Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-31 16:12:19 +08:00
ouyangxuhua defba80427 栏目配置中，“设为显示”改成“设为可见" 2015-12-31 16:11:48 +08:00
lizanle a82fef3ea2 资源库新上传资源不能被删除 2015-12-31 16:08:46 +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
cxt 7e76a32480 项目/课程讨论区的动态增加设置菜单 2015-12-31 15:36:42 +08:00
lizanle c3b7662cac issue按更新时间排序 2015-12-31 15:17:48 +08:00
ouyangxuhua 358510a2e6 解决组织配置资源栏目中，增加/删除栏目不能更新的问题 2015-12-31 14:55:41 +08:00
lizanle fccbbe6e2b 不允许重复发送。但是发送过程不会给予提示。如果课程或者项目或者组织已经有了该资源，那么该资源的更新时间会变化 2015-12-31 14:52:50 +08:00
ouyangxuhua 373e40f4fd 未登陆情况下，不能发布帖子 2015-12-31 14:13:31 +08:00
ouyangxuhua 22be66f85c 课程/项目帖子中，用户在登陆情况下即可发送帖子 2015-12-31 14:00:33 +08:00
ouyangxuhua f0111ad79d Merge branch 'develop' into dev_hjq 2015-12-31 13:30:07 +08:00
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +08:00
lizanle 57ef7a2d4a 发送资源默认为私有的。 2015-12-31 12:41:09 +08:00
lizanle 2c7ef034cb 资源库更改 2015-12-31 12:27:31 +08:00
Tim 63b7330cd8 邮件提交标题中统计数 2015-12-31 11:39:00 +08:00
cxt 2c5a4f8a13 发布和编辑作业时的启用匿评改为禁用匿评，默认不选中 2015-12-31 11:36:21 +08:00
Tim b380b515c6 修改邮件标题统计 2015-12-31 11:18:06 +08:00
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +08:00
lizanle 20a03b2386 点击展开更多 2015-12-31 11:12:00 +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
Tim e876cb09d9 自动出现的controller文件 2015-12-31 10:28:58 +08:00
ouyangxuhua 2271befedd 修正组织部分页面的样式 2015-12-31 09:50:41 +08:00
lizanle b132e8483c 个人资源库搜索不到组织资源 2015-12-31 09:08:07 +08:00
ouyangxuhua 68a6f3f7f2 1.组织管理员有删除帖子的权限；2.删除帖子后更新org_activities表 2015-12-30 18:44:54 +08:00
ouyangxuhua c2578698f5 1.组织管理员有权限访问帖子资源栏目 
2.解决组织页面下的帖子样式的bug
 2015-12-30 18:25:56 +08:00
lizanle a85a3339bb 文件的删除限制加大 
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
 2015-12-30 18:24:07 +08:00
lizanle c34127f21f 文件的删除限制加大 
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
 2015-12-30 18:04:04 +08:00
ouyangxuhua 29c720a8a4 1.权限管理问题 2015-12-30 17:45:15 +08:00
lizanle 0ef0045941 发送功能要添加copy_from 2015-12-30 17:39:00 +08:00
ouyangxuhua 82b8cb77fd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:28:04 +08:00
cxt 1448c4f90e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:28:34 +08:00
lizanle b7eda83def 历史资源功能 2015-12-30 17:27:44 +08:00