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

10418 Commits

Author SHA1 Message Date
huang 5532ec3b86 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
 2016-10-15 10:53:01 +08:00
daiao f8638d173a 项目配置，成员列表功能 2016-10-15 10:48:24 +08:00
huang f1e4628e75 组织添加历史版本删除功能 2016-10-15 09:17:47 +08:00
huang 7e1d871cf0 更新资源刷新 2016-10-15 09:04:19 +08:00
daiao d3575b288e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	db/schema.rb
 2016-10-15 09:00:03 +08:00
huang 3db29cd40b J解决重复提交问题 2016-10-14 21:10:58 +08:00
daiao 64d446e480 还原组织一级栏目列表 2016-10-14 20:35:51 +08:00
cxt d5eea455e9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 20:31:53 +08:00
Tim 162838dae6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 20:31:04 +08:00
Tim 9ce87808c8 里程碑编辑页面样式添加 2016-10-14 20:30:52 +08:00
huang 3a1ab607fa 附件重复提交问题 2016-10-14 20:25:14 +08:00
huang 91ee5a0d9f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 19:21:54 +08:00
huang 80bf13c516 资源库删除历史版本功能 2016-10-14 19:21:41 +08:00
Tim 71f43c757f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 18:25:44 +08:00
Tim 981e1eb358 问卷宽度减少，编辑按钮可见 2016-10-14 18:25:35 +08:00
cxt 5870c3eaaf 子栏目讨论区列表的排序、作品内容的样式调整 2016-10-14 18:24:54 +08:00
huang 0760836f29 项目base优化 2016-10-14 17:23:51 +08:00
cxt 2d7c7dc05d 左侧讨论区子栏目的样式修改 2016-10-14 17:13:26 +08:00
cxt 89307f9e84 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 17:05:55 +08:00
cxt 5b5bfe005e 新增栏目名称过长时添加失败 2016-10-14 17:05:47 +08:00
Tim 7f7f786aa0 资源库描述文字折行 2016-10-14 16:59:50 +08:00
Tim 75a68e9844 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 16:34:09 +08:00
Tim a302dcca04 匿评分数tip 2016-10-14 16:33:56 +08:00
cxt a1b70a7e91 Merge branch 'cxt_course' into develop 2016-10-14 16:18:12 +08:00
cxt 2d508254ac 51、94用户个人主页报500 2016-10-14 16:16:35 +08:00
Tim 8aaab44697 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-14 16:13:44 +08:00
Tim 2955d07f7c 分数显示tip 2016-10-14 16:13:30 +08:00
huang 446f0d142c Merge branch 'rep_quality' into develop 2016-10-14 16:11:49 +08:00
cxt 38d43cfb67 必答不应换行 2016-10-14 16:11:46 +08:00
huang caa54c77a2 解决issue的冲突 2016-10-14 16:00:40 +08:00
cxt 9810539e84 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/poll/_show_head.html.erb
 2016-10-14 15:58:11 +08:00
cxt 45008d9868 班级问卷：鼠标点击描述框，光标却自动定位到第二行了 2016-10-14 15:55:47 +08:00
Tim 0859f86518 空问卷头部编辑按钮位置更改 2016-10-14 15:46:15 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality 
Conflicts:
	public/stylesheets/css/project.css
 2016-10-14 15:43:45 +08:00
cxt 6b7ca9c84d 问卷调查：编辑（笔）图标按钮建议改成当鼠标移上去时才显示、多选题不显示的bug 2016-10-14 15:30:44 +08:00
Tim e72b2de6e2 长单词强制折行 2016-10-14 15:29:07 +08:00
huang 0c137515c1 项目、组织存在历史版本一键删除功能 2016-10-14 15:08:29 +08:00
huang 333c9c6db0 项目历史版本一键删除功能 2016-10-14 15:01:22 +08:00
Tim 2735aca331 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-14 14:51:09 +08:00
Tim 86de58f793 问卷问题增加支持折行输入功能；输入随文字高度自适应js；问卷折行输入按格式输出css支持及格式调整 2016-10-14 14:50:51 +08:00
huang b408b6ef97 组织历史版本删除功能 2016-10-14 14:46:48 +08:00
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
huang dcbeea6dff 版本库可见权限优化 2016-10-14 09:01:25 +08:00
daiao 2324ad31e2 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	public/stylesheets/css/common.css
	public/stylesheets/css/project.css
 2016-10-13 17:00:53 +08:00
daiao 5ae89613ec 项目配置成员界面 2016-10-13 16:57:43 +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 e2ee75d8c1 项目宽版架构优化（主要是model及与课程等模块的分离） 2016-10-13 10:52:48 +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
daiao 07b98bae5e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-13 09:28:47 +08:00
daiao a0aa34b533 项目设置，模块页面 2016-10-13 09:28:33 +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
huang b9b20ccc59 项目配置，各个页面高度JS控制 2016-10-12 17:18:35 +08:00
Tim 63a496d0d3 博客详情页面全文显示 2016-10-12 17:04:16 +08:00
daiao 065ec67417 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 17:03:33 +08:00
huang 4348ae653f Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 17:03:05 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
daiao 4093847017 Merge branch 'develop' into dev_newproject 2016-10-12 16:29:14 +08:00
daiao b925ee312e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 16:28:02 +08:00
daiao 9b5999eed1 项目Issue列表功能 2016-10-12 16:27:50 +08:00
huang 50f9c5244d 项目配置--版本库代码简化及界面 2016-10-12 16:09:17 +08:00
Tim af4ace1319 将匿评和分数提示弹框在右侧固定位置显示 2016-10-12 16:00:10 +08:00
huang fabe6bd999 项目配置过短的时候JS控制底端留白 2016-10-12 14:38:46 +08:00
huang 2126364a19 新版项目配置及JS 2016-10-12 14:13:52 +08:00
cxt 399b982e0d 問卷 2016-10-12 13:34:09 +08:00
huang 7800ba9701 项目动态头部 2016-10-12 11:09:41 +08:00
huang 57d1397597 版本库界面优化（未完） 2016-10-12 10:45:14 +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 a206a471af Merge branch 'dev_newproject' into dev_newrep 
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/base_projects.html.erb
 2016-10-11 10:58:37 +08:00
huang dd452f9efe Merge branch 'dev_daiao_temp' into develop 2016-10-11 10:32:26 +08:00
huang 7e0a5952f2 issue列表新界面 2016-10-11 10:24:38 +08:00
huang 227965aafe 新版base完成 2016-10-11 10:16:17 +08:00
huang 3c15c4f315 版本库权限，及项目收藏用户列表 2016-10-11 10:03:00 +08:00
daiao 61b07e3f13 资源库，公有资源/我的资源中，根据大小，下载数，上传时间排序时，箭头样式不对 2016-10-11 09:53:27 +08:00
huang 188db13c33 项目导航权限判断 2016-10-11 09:31:17 +08:00
huang e9a1582b71 项目添加收藏功能 2016-10-11 09:30:45 +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
huang 17743457e1 项目menu导航 2016-10-10 10:41:41 +08:00
yuanke b94553edcd 搜索修改及代码优化 2016-10-10 09:38:21 +08:00
huang bd29a637b6 新版项目 2016-10-09 17:24:37 +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 acb6fcfc81 Merge branch 'develop' into dev_newrep 2016-10-09 15:36:49 +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
huang 45d8e64840 修改gitlab tree返回类型（lastrev） 2016-10-09 09:30:20 +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 c03384f122 Merge branch 'develop' into dev_newrep 2016-10-08 17:29:59 +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
huang baf556bd39 提示语 2016-10-08 17:20:27 +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 937f93e756 Merge branch 'develop' into dev_newrep 2016-10-08 16:05:47 +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
huang 54b66b86dc 0 2016-10-08 15:58:05 +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
huang 84fd99ced1 项目base优化 2016-10-08 15:09:59 +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