 cxt
|
c999bbbaa6
|
Merge branch 'develop' into cxt_course
|
2015-12-15 16:10:44 +08:00 |
|
cxt
|
90c7822c38
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-15 16:06:59 +08:00 |
|
cxt
|
040b00f130
|
Merge branch 'szzh' into develop
|
2015-12-15 16:06:36 +08:00 |
|
cxt
|
a74808626c
|
Merge branch 'szzh' into cxt_course
|
2015-12-15 16:05:20 +08:00 |
|
cxt
|
72c475e8a2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-15 16:03:26 +08:00 |
|
cxt
|
eb3e562e9a
|
Merge branch 'cxt_course' into szzh
|
2015-12-15 16:03:15 +08:00 |
|
cxt
|
d6c2b95858
|
学生测验列表的提示信息
|
2015-12-15 16:02:10 +08:00 |
|
cxt
|
0215e5e38c
|
若测验已截止且学生已提交则在测验列表后面显示“已答”
|
2015-12-15 15:37:57 +08:00 |
|
cxt
|
0deffdba33
|
在线测验学生答题时可点击保存也可点击提交
|
2015-12-15 15:21:52 +08:00 |
 Tim
|
b687c42de3
|
Merge branch 'dev_zanle' of https://git.trustie.net/jacknudt/trustieforge into dev_zanle
|
2015-12-15 15:01:21 +08:00 |
|
Tim
|
b761121f9f
|
"指派给"颜色更换
|
2015-12-15 15:00:24 +08:00 |
 guange
|
da5709e3f0
|
.
|
2015-12-15 14:52:24 +08:00 |
|
cxt
|
0b25f36a7f
|
在线测验再次编辑时默认隐藏头部编辑块
|
2015-12-15 14:39:32 +08:00 |
 ouyangxuhua
|
d9df926c2b
|
组织添加项目/组织弹窗，点击取消后，关闭弹窗。
|
2015-12-15 10:47:35 +08:00 |
|
cxt
|
1f4454d908
|
课程左侧的在线测验统计数
|
2015-12-15 10:43:43 +08:00 |
|
ouyangxuhua
|
3efb36a28e
|
在组织非资源栏目页面中，添加资源后跳转至资源栏目页面。
|
2015-12-15 09:59:11 +08:00 |
|
guange
|
8d797c5c0b
|
项目动态添加at
|
2015-12-15 09:09:41 +08:00 |
 huang
|
ea1849e51f
|
去掉邮件token值
|
2015-12-15 09:09:26 +08:00 |
 lizanle
|
88c2db47b7
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/helpers/application_helper.rb
|
2015-12-15 08:48:08 +08:00 |
|
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
|
guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
|
guange
|
f61f639af2
|
转换为remote js
|
2015-12-14 17:13:57 +08:00 |
|
cxt
|
2b5bf9540d
|
关闭了匿评再补交作品，给学生的提示信息中“当前作业已开启匿评...”改为“当前作业已关闭匿评...”
|
2015-12-14 17:11:07 +08:00 |
|
cxt
|
af0e592d8a
|
匿评日期的设置
|
2015-12-14 17:03:20 +08:00 |
|
cxt
|
438ae82980
|
非课程学生不能关联项目
|
2015-12-14 17:02:44 +08:00 |
|
cxt
|
d7b690e53a
|
匿评设置时匿评关闭日期可以等于匿评开启日期
|
2015-12-14 16:54:28 +08:00 |
|
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
2015-12-14 16:41:18 +08:00 |
|
cxt
|
85b11010d2
|
在线测验报500、 学生看不到已截止的测验、测验列表的样式调整
|
2015-12-14 16:18:39 +08:00 |
|
lizanle
|
f3013ca3e7
|
修改了搜索的提示描述
|
2015-12-14 11:22:36 +08:00 |
|
lizanle
|
c5f903146d
|
博客资源下载问题
|
2015-12-14 11:19:43 +08:00 |
|
lizanle
|
9aebafee09
|
课程添加更新时间
|
2015-12-14 11:11:09 +08:00 |
|
lizanle
|
14912078ee
|
博客资源允许下载
|
2015-12-14 11:03:04 +08:00 |
|
ouyangxuhua
|
b72cc82e4d
|
组织资源栏目添加文件标签功能
|
2015-12-14 10:59:32 +08:00 |
|
lizanle
|
85e2eab8c3
|
发送资源
|
2015-12-14 10:57:17 +08:00 |
|
huang
|
5ca8d4cd66
|
修改http链接自动换域名
|
2015-12-14 10:54:37 +08:00 |
|
lizanle
|
c004b05991
|
资源库搜索 sql注入
|
2015-12-14 10:52:19 +08:00 |
|
lizanle
|
f6867068f5
|
项目 帖子 更新时间
资源 下载次数
用户 最后登陆时间
|
2015-12-14 10:27:30 +08:00 |
|
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目，增加搜索功能
|
2015-12-14 10:26:34 +08:00 |
|
lizanle
|
9b86ec3044
|
更新时间
|
2015-12-14 10:07:55 +08:00 |
|
cxt
|
eb8e9f32a3
|
作品列表的私有项目不可点击
|
2015-12-14 10:06:19 +08:00 |
|
cxt
|
c199de1d36
|
Merge branch 'szzh' into cxt_course
|
2015-12-14 08:43:44 +08:00 |
|
guange
|
91b245ad2c
|
lastname为空时也可以加,可以省掉查询extensions的语句
|
2015-12-12 18:06:59 +08:00 |
|
lizanle
|
7c114e1a13
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-11 19:34:29 +08:00 |
|
lizanle
|
f028992a18
|
帖子搜索
|
2015-12-11 19:34:17 +08:00 |
|
huang
|
625f993ed2
|
Merge branch 'szzh' into develop
|
2015-12-11 19:14:30 +08:00 |
|
cxt
|
7a0828a826
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 19:13:43 +08:00 |
|
cxt
|
502310425b
|
匿评成绩为空
|
2015-12-11 19:13:34 +08:00 |
|
huang
|
7e85302d9b
|
Merge branch 'szzh' into develop
|
2015-12-11 18:12:56 +08:00 |
|
huang
|
a791c39b4b
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:12:25 +08:00 |
|
cxt
|
dfd0c95f2a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 18:11:48 +08:00 |