 daiao
|
262c4c5673
|
Merge branch 'develop' into dev_shcool
|
2016-10-14 17:53:47 +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 |
|
daiao
|
ec582af985
|
Merge branch 'develop' into dev_shcool
|
2016-10-14 17:01:21 +08:00 |
 Tim
|
8e9694ba79
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 17:00:16 +08:00 |
|
Tim
|
7f7f786aa0
|
资源库描述文字折行
|
2016-10-14 16:59:50 +08:00 |
|
cxt
|
e59f3f887a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 16:44:42 +08:00 |
|
cxt
|
d247109819
|
编程作业提示信息
|
2016-10-14 16:44:37 +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
|
0a9b6bcdbc
|
资源发布失败测试
|
2016-10-14 16:17:00 +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 |
|
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 |