 cxt
|
bfde278340
|
学生作品列表的样式调整
|
2015-12-16 11:02:52 +08:00 |
 huang
|
85d277da0d
|
Merge branch 'develop' into hjq_new_course
|
2015-12-16 10:54:11 +08:00 |
|
huang
|
98d0e6d411
|
版本库“提交明细”
|
2015-12-16 10:53:28 +08:00 |
|
cxt
|
a1a180bab5
|
Merge branch 'develop' into cxt_course
|
2015-12-16 10:34:02 +08:00 |
 lizanle
|
02a9f08fe6
|
表单长度对齐
|
2015-12-16 10:19:48 +08:00 |
|
huang
|
ac8aa9e0a6
|
解决作业留言和课程留言导致的bug
|
2015-12-16 10:03:51 +08:00 |
|
huang
|
41bb37d6d4
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
解决冲突
|
2015-12-16 10:02:08 +08:00 |
|
huang
|
06e5784436
|
解决英雄榜两个用户同时存在的but
|
2015-12-16 10:00:10 +08:00 |
|
lizanle
|
47a9be132a
|
详情和编辑页面
|
2015-12-16 09:31:11 +08:00 |
 ouyangxuhua
|
8d7a84285b
|
资源栏目在搜索结果中，更新相应的tag数量
|
2015-12-16 09:28:55 +08:00 |
|
ouyangxuhua
|
704954583b
|
资源栏目新增Tag后，更新相应的tag数量
|
2015-12-16 09:15:54 +08:00 |
|
lizanle
|
8d1003770a
|
在本页面重复修改的时候，由于edit页面没有更新，导致issue更新触发乐观锁。lock_version比数据库记录存在的lock_version更低，所以回滚。
|
2015-12-15 23:01:54 +08:00 |
|
cxt
|
097d0653ba
|
注释掉给未答题的学生0分的代码
|
2015-12-15 20:33:29 +08:00 |
|
cxt
|
481b7b96eb
|
正式版报500
|
2015-12-15 20:15:10 +08:00 |
|
cxt
|
699d0e22dd
|
删除多余学生的测验数据
|
2015-12-15 19:05:19 +08:00 |
|
lizanle
|
68aceaa7df
|
issue下载
|
2015-12-15 18:43:58 +08:00 |
|
cxt
|
fa4a2eb0dd
|
未答题的学生测验分数为0
|
2015-12-15 18:37:00 +08:00 |
|
lizanle
|
b7ae8d866f
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-12-15 18:12:49 +08:00 |
|
lizanle
|
ef2f142f62
|
论坛资源允许下载
|
2015-12-15 18:12:32 +08:00 |
|
cxt
|
f7a932d7b9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-15 17:37:28 +08:00 |
|
ouyangxuhua
|
dc45321454
|
组织文章二级回复代码被覆盖，恢复代码
|
2015-12-15 17:34:40 +08:00 |
|
cxt
|
44ce4fe592
|
多次点击留言不会重复提交
|
2015-12-15 17:34:08 +08:00 |
|
cxt
|
45726576cf
|
学生测验列表的点击
|
2015-12-15 17:31:27 +08:00 |
|
ouyangxuhua
|
af157a9c63
|
组织资源栏目增加标签功能
|
2015-12-15 17:30:24 +08:00 |
|
cxt
|
7d70f53a38
|
Merge branch 'cxt_course' into develop
|
2015-12-15 16:52:11 +08:00 |
|
cxt
|
086cfa3867
|
学生列表不可点击
|
2015-12-15 16:51:21 +08:00 |
 guange
|
4ce9eb428e
|
at样式问题
|
2015-12-15 16:28:11 +08:00 |
|
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 |