 daiao
|
7d8091e455
|
Merge branch 'dev_shcool' into develop
|
2016-10-14 16:03:57 +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
|
eff68d937f
|
gemfile
|
2016-10-14 15:45:13 +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 |
|
daiao
|
39031c73d4
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/views/users/_course_newslist.html.erb
|
2016-10-13 17:23:49 +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
|
39cc6c36ea
|
issue详情显示调整
|
2016-10-13 10:17:54 +08:00 |
|
cxt
|
8b4c02ec98
|
问卷增加其他选项、多行主观题的改版
|
2016-10-13 10:17:09 +08:00 |
|
Tim
|
0773c12cde
|
暂时保留project.css中共用的班级主页css
|
2016-10-13 10:12:40 +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 |
|
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 |
|
yuanke
|
e52026142a
|
主页搜索功能的下一页修改
|
2016-10-12 17:10:38 +08:00 |
|
Tim
|
63a496d0d3
|
博客详情页面全文显示
|
2016-10-12 17:04:16 +08:00 |
|
Tim
|
a8ca2e136c
|
Merge branch 'develop' into cs_optimize_txz
|
2016-10-12 16:47:12 +08:00 |