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

10342 Commits

Author SHA1 Message Date
cxt d7a17868ad 去掉问卷描述的字数限制 2016-10-14 14:38:26 +08:00
huang 4646f20bba 项目版本库历史版本删除功能及弹框样式 2016-10-14 14:28:51 +08:00
cxt 12ad7c1612 班级讨论区增加二级子栏目 2016-10-14 14:28:19 +08:00
huang db63a5514d 项目资源库历史版本更新及局部刷新 2016-10-14 13:45:47 +08:00
daiao c26af37456 管理员界面项目列表可以按状态进行搜索功能；游客身份，班级留言右侧“+"隐藏 2016-10-14 09:29:53 +08:00
yuanke bb0833c054 issue 2016-10-13 14:51:35 +08:00
yuanke 7dc0ba005e Merge branch 'dev_shcool' into develop 
Conflicts:
	app/views/issues/index.html.erb
	app/views/users/_course_newslist.html.erb
 2016-10-13 14:37:37 +08:00
cxt f56fc5a44d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-13 14:25:36 +08:00
cxt 252da9c3d3 Merge branch 'cs_optimize_txz' into develop 2016-10-13 14:24:01 +08:00
yuanke 1afa774fa9 Merge branch 'weixin_guange' into develop 2016-10-13 14:23:52 +08:00
cxt d2b6d81373 Merge branch 'cxt_replies' into develop 
Conflicts:
	app/views/blog_comments/show.html.erb
	app/views/blogs/_article.html.erb
	app/views/org_document_comments/show.html.erb
 2016-10-13 14:22:05 +08:00
cxt 5fb7da4681 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/public.css
 2016-10-13 14:17:54 +08:00
cxt 39151c0e65 班级-多重角色的显示错误：当一个成员的身份是：助教和学生时，角色切换按钮显示的是“学生身份”和“教师身份” 正确的应该是“学生身份”和“助教身份” 2016-10-13 14:14:32 +08:00
cxt 018a27f307 课程大纲的教师团队：创建班级数与参与班级数均为该老师在本课程下的创建班级数与参与班级数 2016-10-13 14:05:50 +08:00
cxt b240f801b8 创建班级，和班级设置里面，开始学期和结束学期的范围，请往前扩大3年 2016-10-13 11:30:41 +08:00
cxt 59f2478cae 首页动态过滤 “课程动态” -》“班级动态” 2016-10-13 11:25:26 +08:00
cxt d87e4f368a 学生答完问卷后的显示界面调整，提交问卷时的必答题的判断，新建题目时先不输入标题会提示“标题不能为空”、接着输入标题后依然提示“标题不能为空” 2016-10-13 11:22:38 +08:00
huang 39cc6c36ea issue详情显示调整 2016-10-13 10:17:54 +08:00
cxt 8b4c02ec98 问卷增加其他选项、多行主观题的改版 2016-10-13 10:17:09 +08:00
Tim 746e27903e 版本显示与提交变更页面宽度调整 2016-10-13 09:49:34 +08:00
huang dd4d20011d 公共资源库显示优化 2016-10-13 09:43:53 +08:00
yuanke 068a66ac35 搜索修改 2016-10-13 09:42:53 +08:00
huang edf2a059e8 Merge branch 'develop' into rep_quality 2016-10-13 09:00:35 +08:00
yuanke 5ac30fe09c Merge branch 'cxt_replies' into weixin_guange 2016-10-13 08:49:20 +08:00
Tim 8459779e6f 个人主页签名折行显示 2016-10-12 17:26:53 +08:00
Tim 63a496d0d3 博客详情页面全文显示 2016-10-12 17:04:16 +08:00
Tim af4ace1319 将匿评和分数提示弹框在右侧固定位置显示 2016-10-12 16:00:10 +08:00
cxt 399b982e0d 問卷 2016-10-12 13:34:09 +08:00
Tim c693afdee8 project.css去重，提取到public.css 2016-10-11 17:26:36 +08:00
cxt a581f989c9 给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复 2016-10-11 14:08:44 +08:00
huang dd452f9efe Merge branch 'dev_daiao_temp' into develop 2016-10-11 10:32:26 +08:00
daiao 61b07e3f13 资源库，公有资源/我的资源中，根据大小，下载数，上传时间排序时，箭头样式不对 2016-10-11 09:53:27 +08:00
cxt 405e2cfb9b 问卷单选题 2016-10-11 08:51:00 +08:00
daiao 850a88c6b0 组织帖子，回复有时不可用 2016-10-10 17:31:39 +08:00
cxt c06e2bf4c6 新建班级 2016-10-10 15:43:30 +08:00
cxt 5a725dd074 去掉公共贴吧为空时的提示信息 2016-10-10 15:39:53 +08:00
cxt 3217f84df2 问卷的单选题 2016-10-10 14:13:20 +08:00
yuanke b94553edcd 搜索修改及代码优化 2016-10-10 09:38:21 +08:00
cxt 4de0105d99 问卷头部的修改 2016-10-09 17:05:32 +08:00
daiao 41ee915ece 数据为空时，帮助中心，问题和建议报500 2016-10-09 16:55:41 +08:00
cxt 9f72539845 本地版新建班级报500 2016-10-09 16:11:34 +08:00
yuanke 9ca685ea94 搜索课程 2016-10-09 16:10:33 +08:00
cxt 2cc2d8e562 课程班级列表的“加入班级”样式调整 2016-10-09 16:05:36 +08:00
yuanke c4de8cf948 调试 2016-10-09 16:00:41 +08:00
huang 125a389448 数据为空的时候“帮助中心”500问题 2016-10-09 15:33:22 +08:00
yuanke 85e0a1df67 搜索课程 2016-10-09 15:20:52 +08:00
huang 2e94fbee81 项目、课程、组织资源描述过长不能提交的问题 2016-10-09 15:09:18 +08:00
yuanke fdcb13a3de 搜索 2016-10-09 13:57:27 +08:00
yuanke 11edc93c0f 搜索课程 2016-10-09 13:48:38 +08:00
yuanke c90d8d6bea 搜索课程 2016-10-09 13:32:31 +08:00
cxt 3b44f05b2b 博客的详情页回复分页、博客列表的回复数未统计二级回复 2016-10-09 11:12:44 +08:00
yuanke cd34388909 搜索课程 2016-10-09 11:01:52 +08:00
yuanke eb3a463166 Merge branch 'develop' into weixin_guange 2016-10-09 10:36:18 +08:00
yuanke d407b5ab10 搜索中加入课程 2016-10-09 10:35:43 +08:00
cxt f0e334d33d 分组作业的迟交扣分和缺评扣分 2016-10-09 09:16:05 +08:00
daiao da630a728e Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-10-09 09:02:39 +08:00
daiao b259f92381 一级帖子栏目默认展示5个，点击可进入详情页面， 2016-10-09 09:02:12 +08:00
cxt 7a72e7e839 课程大纲的附件样式 2016-10-08 19:07:52 +08:00
cxt f332f2a469 组织文章的回复作分页 2016-10-08 17:50:06 +08:00
Tim f1e7e54816 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-08 17:38:57 +08:00
Tim e675050b21 Merge branch 'rep_quality' into develop 2016-10-08 17:38:43 +08:00
Tim 1db5064486 新的合并请求样式调整 2016-10-08 17:37:41 +08:00
huang 4a666d6972 Merge branch 'rep_quality' into develop 2016-10-08 17:27:30 +08:00
huang f3f59c727c 提示语 2016-10-08 17:21:30 +08:00
Tim 6e93b0dc0d 项目去掉右侧白色块后，样式调整 2016-10-08 17:08:07 +08:00
cxt 4aca50e62d 超级管理员可以给课程添加教师 2016-10-08 16:46:59 +08:00
cxt f7e5a41f5e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-08 16:22:47 +08:00
cxt ed05880653 https的链接转换 2016-10-08 16:22:37 +08:00
huang b22d3c9882 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-08 16:04:55 +08:00
huang 30e6bd6d0e 超级管理员看他人的项目列表500问题 2016-10-08 16:04:35 +08:00
cxt 9d65d61f2a 教师团队中只有一个教师时不应有上移功能 2016-10-08 15:56:43 +08:00
Tim 053e66c464 分组作业宽度调整 2016-10-08 15:37:55 +08:00
Tim b4036ba901 分组作业宽度调整 2016-10-08 15:28:09 +08:00
cxt 436fb3e96e 班级的作业列表分页换成新样式 2016-10-08 15:26:47 +08:00
Tim 6bb2501ca0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-08 15:08:22 +08:00
Tim 9ed58acc79 分组作业样式调整 2016-10-08 15:08:07 +08:00
cxt 937b951220 展开某个作品详情时收起其他作品 2016-10-08 15:04:01 +08:00
cxt 6ef45a094f Merge branch 'cxt_course' into develop 2016-10-08 14:24:47 +08:00
cxt 7f3bb0be63 教师团队中上移、下移功能的完善 2016-10-08 13:54:35 +08:00
cxt 9e2c381b4a 取消班级设置页面的课程编辑 2016-10-08 11:22:37 +08:00
huang 23d5d57f5c admin“隐藏项目”顶部显示“公共贴吧” 2016-10-08 10:49:50 +08:00
huang 351ca6d074 Merge branch 'rep_quality' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-10-08 10:41:05 +08:00
cxt bee9dfa1b5 课程下的班级列表图片丢失 2016-10-08 10:38:12 +08:00
huang d29fb00c30 解决用户首页项目列表500问题 2016-10-08 10:29:01 +08:00
cxt 843aacc143 课程大纲自动识别URL 2016-10-08 10:25:19 +08:00
cxt 87050a2adf 挂起的作业报500 2016-09-30 17:49:01 +08:00
cxt ec0d21b243 戴傲项目相关 2016-09-30 17:27:30 +08:00
cxt e5204112d0 教师列表报500 2016-09-30 17:19:57 +08:00
cxt 1cf3c2cd48 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-30 17:12:47 +08:00
cxt b5782bae39 班级左侧导航的“分班” 2016-09-30 17:12:40 +08:00
Tim 918f741db0 总得分tip鼠标放在整行均显示 2016-09-30 17:09:57 +08:00
cxt bcd76d2b9f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-30 17:04:25 +08:00
Tim 7d3847656b 分班名称过长折行显示问题；分班编辑按钮定位；分班icon css 2016-09-30 17:01:55 +08:00
cxt db9d4900ac Merge branch 'cxt_course' into develop 2016-09-30 16:48:05 +08:00
cxt 86e40dbdd8 总得分的提示为空的显示为0 2016-09-30 16:46:46 +08:00
cxt f1b9a98084 编辑作业报500 2016-09-30 16:32:12 +08:00
cxt b25e4ed5d7 新闻、通知的回复分页 2016-09-30 16:09:10 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt a63f58de5b 动态代码的优化 2016-09-30 14:48:42 +08:00
cxt 5d0e3889df 班级、项目、组织帖子详情回复的分页 2016-09-30 14:26:16 +08:00
cxt 7b51812ebb 头像处添加“我的课程”快捷入口 2016-09-30 13:20:35 +08:00
daiao acbc94af1a 项目导航栏数字错误 2016-09-30 11:24:04 +08:00
daiao 0ad71e0f64 issue列表及左侧导航栏问题跟踪的issue的所有数字统计错误 2016-09-30 11:07:22 +08:00
cxt a9a53caa13 学生提交作品后，跳转至“作品列表”，而不是“作业信息” 2016-09-30 10:29:42 +08:00
daiao 742d5b630b 修复课程：导入问卷一直提示未有新建问卷 2016-09-29 17:18:46 +08:00
cxt 17c82c5291 已提交作品的分组作业可扩大分组范围 2016-09-29 17:17:17 +08:00
daiao e2be4a9e7f 后台作业列表：作业班级为空时，作业列表样式错误 2016-09-29 16:55:32 +08:00
daiao b807fc7766 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-29 16:24:04 +08:00
daiao 06ea193eb4 修复资源库公共资源无法右键删除、重命名 2016-09-29 16:23:53 +08:00
Tim c245d2fecd 页面头部贴吧交流改为帮助中心 2016-09-29 15:49:53 +08:00
Tim 858348298b 项目加载慢时，有白色块显示bug修复 2016-09-29 14:24:42 +08:00
cxt fc78ba3c68 组员作品添加评分按钮 2016-09-29 14:11:45 +08:00
cxt 4da5144cd5 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-09-29 11:29:49 +08:00
cxt f6296377bd 班级内的分班 2016-09-29 11:29:37 +08:00
Tim daa887fe0a issue列表样式调整 2016-09-28 16:56:46 +08:00
daiao a6114796b7 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-28 16:52:17 +08:00
Tim 3f559a04bb issue列表边框颜色更改；issue题目宽度增长；回复数和编辑删除位置调整及显隐js实现 2016-09-28 15:20:42 +08:00
huang a95e8aece4 隐藏项目信息的时候显示公共贴吧 2016-09-28 13:39:35 +08:00
daiao 4ea76f4dbc Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-28 11:44:55 +08:00
huang 58b66b5d0b https改成自动获取 2016-09-28 11:43:10 +08:00
huang b8ab3dc497 点数字不还原 2016-09-28 11:39:11 +08:00
huang 382c414341 Merge branch 'rep_quality' into develop 2016-09-28 11:04:03 +08:00
Tim ca81b1a3ba Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-28 11:01:39 +08:00
Tim 30c3ce86d5 wiki新建，显示页面宽度调整 2016-09-28 11:01:30 +08:00
huang b573563a52 Merge branch 'rep_quality' into develop 2016-09-28 10:59:55 +08:00
daiao b22b444a7b 修改issue开始时间与结束时间判断，并将导出excel的作者改为发布人 2016-09-28 10:58:31 +08:00
Tim 69a9171430 分班列表样式调整；作业动态翻页居中 2016-09-28 10:47:58 +08:00
huang 6ece9c0463 性能优化 2016-09-28 10:40:56 +08:00
daiao 86b03542c8 里程碑版本点击空白页 2016-09-28 10:04:20 +08:00
cxt 03fac1900e 分班 2016-09-28 10:00:01 +08:00
huang 0391503257 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-28 09:33:46 +08:00
huang 9a89590ca9 issue总数实时刷新 2016-09-28 09:33:31 +08:00
yuanke 3b85d9e6bd 课程、项目二级回复样式 2016-09-27 21:03:40 +08:00
yuanke 5d234dc849 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-27 20:50:08 +08:00
yuanke f48d3f2c3c 课程回复按钮样式 2016-09-27 20:48:38 +08:00
huang 27f45b5ea0 Merge branch 'rep_quality' into develop 2016-09-27 20:07:34 +08:00
daiao d57f80e703 用户反馈回复 2016-09-27 20:06:48 +08:00
huang b679783cc0 项目动态中issue回复显示 2016-09-27 20:04:29 +08:00
huang e49f9b49b2 Merge branch 'rep_quality' into develop 2016-09-27 19:48:10 +08:00
daiao 7c76584e14 issue功能优化 2016-09-27 19:44:24 +08:00
huang d656d3e94c 项目评分为0 的时候显示 2016-09-27 19:43:11 +08:00
huang fb02a1cf13 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-27 19:41:22 +08:00
huang 7ef7c0c6f0 issue过滤条件导出功能 2016-09-27 19:41:10 +08:00
yuanke 8b8d878564 项目关注列表和成员列表调整宽度 2016-09-27 19:28:40 +08:00
yuanke d976dbf673 作业详情页的显示调整 2016-09-27 18:31:31 +08:00
huang c76cfad51a Merge branch 'rep_quality' into develop 2016-09-27 18:03:02 +08:00
huang 19c1a0d843 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-27 18:01:41 +08:00
huang b96ab3676c issue过滤条件 2016-09-27 18:01:26 +08:00
daiao e730312ec3 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-27 17:01:20 +08:00
daiao 8fb440c593 项目issue功能修改 2016-09-27 17:01:04 +08:00