 cxt
|
13b1d7bb78
|
作业发布的rake
|
2016-10-14 20:31:42 +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
|
e7f930a678
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 20:26:46 +08:00 |
|
huang
|
3a1ab607fa
|
附件重复提交问题
|
2016-10-14 20:25:14 +08:00 |
|
Tim
|
326fab566d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 19:36:03 +08:00 |
|
Tim
|
ef9e9aca04
|
弹框居中显示
|
2016-10-14 19:35:53 +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
|
142e301e53
|
必答换行
|
2016-10-14 18:03:49 +08:00 |
 daiao
|
262c4c5673
|
Merge branch 'develop' into dev_shcool
|
2016-10-14 17:53:47 +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 |
|
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 |