 yuanke
|
bb5d957ec5
|
Merge branch 'cxt_course' into develop
|
2016-10-21 17:46:29 +08:00 |
 cxt
|
3d29eb2be0
|
分班批量添加学生、小班页面
|
2016-10-21 17:34:02 +08:00 |
 Tim
|
20bba5bfe5
|
课程中不能删除创建班级教室title模拟
|
2016-10-21 15:37:26 +08:00 |
|
yuanke
|
108c28be9d
|
Merge branch 'weixin_guange' into develop
|
2016-10-21 14:12:19 +08:00 |
|
cxt
|
86946f9d2c
|
鼠标放在自动保存“恢复”、“不恢复”上要变成手型
|
2016-10-21 09:20:58 +08:00 |
|
yuanke
|
e802629d27
|
Merge branch 'develop' into weixin_guange
Conflicts:
app/models/student_work.rb
app/models/student_work_test.rb
app/views/blog_comments/show.html.erb
public/javascripts/homework.js
|
2016-10-20 13:28:23 +08:00 |
|
cxt
|
f085b79999
|
个人主页的调整
|
2016-10-20 10:50:59 +08:00 |
|
cxt
|
dff47b586e
|
主页宽度调整、主页配置菜单调整
|
2016-10-20 09:26:01 +08:00 |
|
cxt
|
096bc145da
|
问卷样式调整
|
2016-10-19 20:05:21 +08:00 |
|
cxt
|
9c1630b682
|
问卷的标题显示过长
|
2016-10-19 19:43:35 +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
|
e102815f60
|
个人主页
|
2016-10-19 18:03:59 +08:00 |
|
yuanke
|
b907b626a9
|
代码测试结果不全分数100分的BUG修复
|
2016-10-19 10:27:40 +08:00 |
|
yuanke
|
c0e6085e74
|
注册时登录名改为只能字母和数字、字母开头4-15长度
|
2016-10-18 14:47:06 +08:00 |
|
Tim
|
bde2f6b65d
|
项目上传资源弹框样式js控制；更新版本弹框资源名长度控制
|
2016-10-15 16:45:41 +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 |
|
cxt
|
d5eea455e9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-10-14 20:31:53 +08:00 |
|
Tim
|
ef9e9aca04
|
弹框居中显示
|
2016-10-14 19:35:53 +08:00 |
|
cxt
|
5870c3eaaf
|
子栏目讨论区列表的排序、作品内容的样式调整
|
2016-10-14 18:24:54 +08:00 |
|
cxt
|
142e301e53
|
必答换行
|
2016-10-14 18:03:49 +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
|
a1b70a7e91
|
Merge branch 'cxt_course' into develop
|
2016-10-14 16:18:12 +08:00 |
|
cxt
|
38d43cfb67
|
必答不应换行
|
2016-10-14 16:11:46 +08:00 |
|
cxt
|
45008d9868
|
班级问卷：鼠标点击描述框，光标却自动定位到第二行了
|
2016-10-14 15:55:47 +08:00 |
 huang
|
b9d87b1b29
|
Merge branch 'develop' into rep_quality
Conflicts:
public/stylesheets/css/project.css
|
2016-10-14 15:43:45 +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 |
|
cxt
|
12ad7c1612
|
班级讨论区增加二级子栏目
|
2016-10-14 14:28:19 +08:00 |
|
huang
|
db63a5514d
|
项目资源库历史版本更新及局部刷新
|
2016-10-14 13:45:47 +08:00 |
|
cxt
|
252da9c3d3
|
Merge branch 'cs_optimize_txz' into develop
|
2016-10-13 14:24:01 +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
|
8b4c02ec98
|
问卷增加其他选项、多行主观题的改版
|
2016-10-13 10:17:09 +08:00 |
|
Tim
|
0773c12cde
|
暂时保留project.css中共用的班级主页css
|
2016-10-13 10:12:40 +08:00 |
|
Tim
|
746e27903e
|
版本显示与提交变更页面宽度调整
|
2016-10-13 09:49:34 +08:00 |
|
Tim
|
af4ace1319
|
将匿评和分数提示弹框在右侧固定位置显示
|
2016-10-12 16:00:10 +08:00 |
|
cxt
|
399b982e0d
|
問卷
|
2016-10-12 13:34:09 +08:00 |
|
Tim
|
c693afdee8
|
project.css去重，提取到public.css
|
2016-10-11 17:26:36 +08:00 |
|
Tim
|
005cd09d4a
|
大纲中按钮样式移到common.css中；project.css中部分样式去重；翻页去掉灰色边线；大纲项目公用样式提取到public.css中
|
2016-10-11 14:58:50 +08:00 |
|
cxt
|
405e2cfb9b
|
问卷单选题
|
2016-10-11 08:51:00 +08:00 |
|
cxt
|
3217f84df2
|
问卷的单选题
|
2016-10-10 14:13:20 +08:00 |
 daiao
|
da630a728e
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-10-09 09:02:39 +08:00 |