 luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2016-03-11 14:40:07 +08:00 |
|
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
2016-03-11 10:21:59 +08:00 |
|
luoquan
|
7d70e63f8d
|
代码重置
|
2016-03-11 10:18:10 +08:00 |
 yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
2016-03-10 15:12:16 +08:00 |
 cxt
|
0fb808e2fd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-10 14:53:23 +08:00 |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-03-10 14:52:23 +08:00 |
|
cxt
|
cd1409f950
|
还原学生分班
|
2016-03-10 14:51:31 +08:00 |
|
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
2016-03-10 11:40:56 +08:00 |
|
cxt
|
f8f36f9f29
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-10 11:15:43 +08:00 |
|
cxt
|
cc441826ee
|
测试代码即提交代码 系统得分为当次的测试得分
|
2016-03-10 11:15:37 +08:00 |
 Tim
|
5d3d73a783
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-10 10:02:47 +08:00 |
|
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
2016-03-10 10:02:24 +08:00 |
|
cxt
|
5b4ff5ec8a
|
学生列表中的作业积分为负分
|
2016-03-10 09:22:49 +08:00 |
 huang
|
3d2ba83c36
|
@消息问题修复
|
2016-03-09 17:22:16 +08:00 |
|
huang
|
5a4f422b1c
|
消息分页问题
|
2016-03-09 16:44:11 +08:00 |
|
huang
|
53e164048d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-09 15:29:06 +08:00 |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
2016-03-09 15:28:28 +08:00 |
|
huang
|
b4800585e7
|
解决消息 信息500问题
|
2016-03-09 15:24:02 +08:00 |
|
huang
|
84d7049add
|
fork弹出新页面，解决间接性500问题
|
2016-03-09 13:17:37 +08:00 |
|
huang
|
99be187d54
|
版本库 无法预览的文件提供直接下载功能
|
2016-03-09 11:30:28 +08:00 |
|
cxt
|
db1f31724a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-09 11:15:48 +08:00 |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
2016-03-09 11:15:43 +08:00 |
|
Tim
|
d6d8e231e6
|
课程推荐在ie中显示bug
|
2016-03-09 09:46:07 +08:00 |
|
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
2016-03-08 17:38:38 +08:00 |
|
huang
|
f022950408
|
Merge branch 'develop' into hjq_new_course
|
2016-03-08 16:17:18 +08:00 |
|
Tim
|
141c0be24f
|
上传资源弹窗样式调整
|
2016-03-08 15:50:01 +08:00 |
 ouyangxuhua
|
6e21229b4c
|
组织用户链接
|
2016-03-08 15:22:56 +08:00 |
|
ouyangxuhua
|
4442d286ce
|
组织下的用户连接改成https://www.……形式
|
2016-03-08 15:20:38 +08:00 |
|
huang
|
2fdddc6488
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2016-03-08 11:27:22 +08:00 |
|
huang
|
ec4a3b321c
|
更新历史版本，下载次数，引用次数不清零
|
2016-03-08 11:26:55 +08:00 |
|
cxt
|
ca094a13b5
|
优秀作品排行中，不允许访问的，就取消链接。老师设置了完全公开的作品，就有链接
|
2016-03-08 10:16:55 +08:00 |
|
cxt
|
f0e3fe8ff7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-08 09:13:27 +08:00 |
|
cxt
|
2ee93f9f86
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-08 09:12:50 +08:00 |
|
cxt
|
3424be695e
|
题库：发送的弹框中，不要出现已经删除的课程
|
2016-03-08 09:12:37 +08:00 |
|
ouyangxuhua
|
c3eb8e05cd
|
组织的私有资源，数量一致
|
2016-03-07 18:12:40 +08:00 |
|
ouyangxuhua
|
d70df6a89d
|
公开组织的资源，非成员不能看到私有资源
|
2016-03-07 17:41:43 +08:00 |
|
ouyangxuhua
|
699e1f41a7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-07 17:18:39 +08:00 |
|
ouyangxuhua
|
ce187b4212
|
组织资源下载权限控制
|
2016-03-07 17:18:01 +08:00 |
|
cxt
|
64b6af6177
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-07 17:02:03 +08:00 |
|
cxt
|
91d000c8f3
|
编程作业：编程测试集的弹框中，多行却只显示一行
|
2016-03-07 17:01:10 +08:00 |
|
Tim
|
56372fbdd5
|
积分规则显示样式调整
|
2016-03-07 16:50:30 +08:00 |
|
ouyangxuhua
|
2ea553e988
|
Merge branch 'ouyangxuhua' into develop
|
2016-03-07 16:15:13 +08:00 |
|
ouyangxuhua
|
0df34dd3ee
|
组织资源栏目，过滤条件“其他”内容
|
2016-03-07 16:14:44 +08:00 |
|
cxt
|
f8ce6d48d3
|
模拟答题的返回按钮应该回到课程作业列表
|
2016-03-07 14:31:58 +08:00 |
|
cxt
|
e30c26aa09
|
课程报500
|
2016-03-07 13:56:28 +08:00 |
|
ouyangxuhua
|
a0363b5511
|
组织资源发送后，发送次数动态增加
|
2016-03-07 12:57:24 +08:00 |
|
ouyangxuhua
|
319f286a65
|
解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适
|
2016-03-07 12:19:48 +08:00 |
|
cxt
|
fcae91ecc1
|
“课程通知”改为“通知”
|
2016-03-07 11:27:47 +08:00 |
|
cxt
|
cff5e9171f
|
导入作业后页面不应跳转到被导入的作业页面
|
2016-03-07 11:21:58 +08:00 |