 cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-03-10 14:52:23 +08:00 |
|
cxt
|
5b4ff5ec8a
|
学生列表中的作业积分为负分
|
2016-03-10 09:22:49 +08:00 |
 huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
2016-03-08 17:38:38 +08:00 |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
2016-03-05 04:01:10 +08:00 |
|
huang
|
f381784a3c
|
数据迁移
|
2016-03-05 03:13:58 +08:00 |
|
huang
|
9beaa62d6d
|
课程活跃度
|
2016-03-04 11:36:34 +08:00 |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
2016-03-03 18:51:28 +08:00 |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
2016-02-26 17:00:29 +08:00 |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
2016-02-26 16:26:51 +08:00 |
 ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
2016-02-26 16:18:17 +08:00 |
 newuser
|
d2bd4706d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-02-26 14:57:41 +08:00 |
|
cxt
|
09c8e57f1c
|
复制课程时可复制资源和作业
|
2016-02-26 10:41:14 +08:00 |
|
ouyangxuhua
|
991613d760
|
在转发表forwards记录发送帖子、通知
|
2016-02-25 16:22:42 +08:00 |
|
ouyangxuhua
|
11231d0ff9
|
1.解决组织配置报500的错误；2.增加转发表
|
2016-02-24 16:01:32 +08:00 |
|
huang
|
90208e166f
|
项目统计数小于0情况判断
|
2016-02-23 13:24:20 +08:00 |
|
huang
|
44f192e5a6
|
解决资源总数为负数的问题
|
2016-02-23 13:02:37 +08:00 |
|
huang
|
2156b6db76
|
issue回复 Forge自动更新排序靠前
|
2016-02-22 16:56:37 +08:00 |
|
huang
|
1234bc0aef
|
课程导语从帖子中获取
|
2016-02-22 15:34:50 +08:00 |
|
huang
|
a7470e059d
|
历史版本提供附件下载功能
|
2016-02-20 16:19:35 +08:00 |
 guange
|
7f8f3fa152
|
被rubymine坑了，这两个文件没加进去
|
2016-02-02 18:47:53 +08:00 |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-02-02 15:51:49 +08:00 |
|
guange
|
71778ba948
|
拷贝课程图标
|
2016-01-29 22:10:04 +08:00 |
|
cxt
|
ee73191a19
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-29 19:44:04 +08:00 |
|
cxt
|
82fb50ccd2
|
课程学生列表的作业积分不一致
|
2016-01-29 19:22:10 +08:00 |
|
ouyangxuhua
|
125f00689b
|
把组织未读消息加入铃铛消息提醒中
|
2016-01-29 17:49:20 +08:00 |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
2016-01-29 15:45:47 +08:00 |
|
cxt
|
b5cf138f43
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/student_work/_programing_work_show.html.erb
db/schema.rb
|
2016-01-29 15:44:26 +08:00 |
|
ouyangxuhua
|
135cb410bc
|
1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突
|
2016-01-27 15:29:15 +08:00 |
|
guange
|
d8ef2f0965
|
个人留言中的at启用
|
2016-01-26 18:24:15 +08:00 |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
2016-01-26 11:17:55 +08:00 |
|
huang
|
655cc0d2db
|
issue截止时间邮件通知
|
2016-01-22 20:26:44 +08:00 |
|
ouyangxuhua
|
26f8500671
|
博客回复后，该博客的更新时间为当前时间
|
2016-01-22 18:42:50 +08:00 |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 17:30:07 +08:00 |
|
ouyangxuhua
|
d4c3cb8777
|
Merge branch 'develop' into dev_hjq
|
2016-01-22 17:13:46 +08:00 |
|
huang
|
e871c6823f
|
Merge branch 'develop' into hjq_new_course
|
2016-01-22 09:57:45 +08:00 |
|
huang
|
59aa1e9c6f
|
issue截止修改
|
2016-01-22 09:55:58 +08:00 |
|
ouyangxuhua
|
a15f7fa97b
|
系统管理员增加组织管理员的权限
|
2016-01-22 09:54:20 +08:00 |
|
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
2016-01-21 16:10:29 +08:00 |
|
huang
|
56e804b423
|
issue邮件name问题
|
2016-01-21 15:52:07 +08:00 |
|
huang
|
ff475fb00b
|
Merge branch 'szzh' into develop
|
2016-01-21 15:35:38 +08:00 |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
2016-01-21 15:32:18 +08:00 |
|
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
2016-01-21 11:19:08 +08:00 |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
2016-01-20 17:23:02 +08:00 |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
2016-01-20 17:05:28 +08:00 |
|
huang
|
0db69e1ebf
|
解决课程导语时间和课程创建动态时间一致的问题
|
2016-01-20 16:32:47 +08:00 |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
2016-01-20 16:24:14 +08:00 |
|
huang
|
18c3c23d2c
|
课程推荐
|
2016-01-20 15:43:33 +08:00 |
|
huang
|
610b54b27c
|
课程导语放置课程动态之后
|
2016-01-19 10:29:57 +08:00 |
|
huang
|
b93b86b9a0
|
创建课程发送board
|
2016-01-18 17:16:33 +08:00 |
|
huang
|
ef0a2a54c5
|
精品课程推荐
|
2016-01-18 15:48:26 +08:00 |