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

13663 Commits

Author SHA1 Message Date
cxt 750a9c9d38 问卷答题报网络异常 2016-10-15 19:34:58 +08:00
Tim bde2f6b65d 项目上传资源弹框样式js控制；更新版本弹框资源名长度控制 2016-10-15 16:45:41 +08:00
Tim 6ae066937d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:48:02 +08:00
Tim 16bedc3d8f 项目资源库弹窗位置及样式js控制 2016-10-15 15:47:48 +08:00
cxt 61bfe405f3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:35:13 +08:00
Tim ee03cda8a6 班级资源库弹窗样式及位置js控制 2016-10-15 15:34:33 +08:00
cxt a709f5c720 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 15:16:39 +08:00
cxt a289a2cee0 班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果 2016-10-15 15:16:21 +08:00
Tim 0c481de79d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-15 13:41:45 +08:00
Tim bc37d09edf 更新资源版本title长度限制 2016-10-15 13:41:33 +08:00
huang 106e77409b Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 2016-10-15 12:36:42 +08:00
huang 8005958f03 删除版本刷新 2016-10-15 12:35:36 +08:00
huang 6dbb50f803 确定按钮变成手型 2016-10-15 11:34:06 +08:00
huang 50ba2fb04f 多个历史版本和没有历史版本删除附件提醒 2016-10-15 11:31:15 +08:00
huang da7de2c2a2 更新版本中隐藏删除 2016-10-15 11:12:12 +08:00
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 3ceee6522b 还原新建贴吧报贴吧名已存在的问题 2016-10-14 21:05:40 +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 ce1da89e02 Merge branch 'cxt_replies' into develop 2016-10-14 16:18:43 +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
cxt 5f04baf572 博客动态回复显示：“展开更多”、“收起回复”点击无反应 2016-10-14 15:09:47 +08:00
huang 0c137515c1 项目、组织存在历史版本一键删除功能 2016-10-14 15:08:29 +08:00
cxt f87e335acf 课程大纲、作业二级回复不可用 2016-10-14 15:01:36 +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 b8296f3e7e 首页的课程列表显示缺漏 2016-10-13 14:08:20 +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
yuanke 0265b6bfb7 搜索分页修改 2016-10-13 09:52:05 +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
yuanke 9911faaa49 优化下回复相关的微信动态 2016-10-13 09:25:18 +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
yuanke a7aa0b3a84 微信回复加上root_id 2016-10-13 08:47:55 +08:00
Tim 8459779e6f 个人主页签名折行显示 2016-10-12 17:26:53 +08:00
huang b9b20ccc59 项目配置，各个页面高度JS控制 2016-10-12 17:18:35 +08:00
yuanke e52026142a 主页搜索功能的下一页修改 2016-10-12 17:10:38 +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