Commit Graph

13663 Commits

Author SHA1 Message Date
cxt 891c0018e5 多层回复时的展现方式调整 2016-10-25 13:56:25 +08:00
cxt 15b6aaf2a2 新建班级、新建课程增加tip说明 2016-10-25 13:21:01 +08:00
cxt c962e3c18b 导入问卷后进入问卷再回退,再点击该问卷,页面报404 2016-10-24 17:35:06 +08:00
cxt cfeece0c76 新建班级样式调整 2016-10-24 17:21:09 +08:00
cxt 3d3b46f7f3 问卷:没有选定时,其它 选项的输入框禁用。选择了才可用 2016-10-24 16:01:46 +08:00
cxt c2a7ec4fc7 游客身份,隐藏讨论区二级栏目新建帖子的入口 2016-10-24 14:10:37 +08:00
cxt fcb1d4d115 打开分班名称编辑框后,点击其他分班名称或全部、未分班,数据刷新,但是编辑框未收起,应该收起 2016-10-24 14:02:09 +08:00
cxt e5377b63d9 问卷导入弹框页显示文字错误,“课程”→“班级” 2016-10-24 11:20:30 +08:00
cxt 9c4eed3cdd 分组作业的作品列表显示“X组已交” 2016-10-24 11:17:23 +08:00
cxt 40a895a786 issue动态附件点击后下载更新为直接查看 2016-10-24 10:57:40 +08:00
cxt 3bc11cd5be 班级左侧导航的小分班增加“添加成员”的快捷按钮 2016-10-24 09:45:49 +08:00
cxt fefc1bf800 分組作业的动态和详情的调整、作品列表增加项目提示和老师加入项目的功能 2016-10-21 19:58:02 +08:00
Tim f730b48eac Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-21 18:40:43 +08:00
cxt 4da113dc19 讨论区增加“添加子栏目”按钮跳到设置页面的添加子栏目 2016-10-21 17:40:19 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
Tim 6b6584d764 分组作业关联项目提示 2016-10-21 17:12:05 +08:00
cxt f9505a24b9 题库发送的提示语不正确:应该是目标班级,而不是目标课程: 2016-10-21 08:59:16 +08:00
cxt f6e86866cb 个人主页调整 2016-10-21 08:55:17 +08:00
cxt 07458b35d9 学生列表的排序箭头方向错误 2016-10-20 16:27:41 +08:00
cxt e8d7e64f80 主页子页面链接 2016-10-20 16:18:45 +08:00
cxt bee1597167 删除的个人主页报500 2016-10-20 15:01:05 +08:00
cxt 453e91dcfb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-20 14:24:13 +08:00
cxt 269083c4a6 分组作业的评分设置 2016-10-20 14:24:07 +08:00
huang df5458675e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-20 13:34:16 +08:00
huang 16b6c55637 注释掉id转换成登录名 2016-10-20 13:34:02 +08:00
cxt 59f0101a62 个人主页的链接改成登录名 2016-10-20 13:32:33 +08:00
huang 786110f711 还原 2016-10-20 13:31:05 +08:00
huang 1b8bf05be5 用户ID装换成用户名 2016-10-20 13:26:11 +08:00
cxt f085b79999 个人主页的调整 2016-10-20 10:50:59 +08:00
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +08:00
cxt 70c7b0d12c 设为主页后页面未刷新 2016-10-19 20:44:14 +08:00
cxt e5cfcdc038 个人主页列表的翻页 2016-10-19 20:33:39 +08:00
cxt dde8be3f94 主页内容自动识别链接 2016-10-19 20:13:26 +08:00
cxt 35caacf067 首页取消、添加关注不可用 2016-10-19 20:03:34 +08:00
cxt 251465ceb5 袁可 编程 2016-10-19 19:41:02 +08:00
cxt 85f489eb97 主页页面设为主页或取消首页后跳转至主页列表、已设为主页的始终显示在前方 2016-10-19 19:38:44 +08:00
cxt bebff7b24a “个人主页列表"变细体、编辑时也可设为主页 2016-10-19 19:05:42 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-19 18:11:02 +08:00
cxt 26121d895f 袁可 编程测试 2016-10-19 18:09:29 +08:00
cxt 800aaf8853 隐藏博客首页 2016-10-19 18:07:19 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
cxt 8648ea605f 问卷导出的统计结果:“其他”选项要标出来,多行主观题要对各小题标识出来 2016-10-18 11:14:29 +08:00
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 f1e4628e75 组织添加历史版本删除功能 2016-10-15 09:17:47 +08:00
huang 7e1d871cf0 更新资源刷新 2016-10-15 09:04:19 +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
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