 huang
|
e8e9688644
|
项目资源数目迁移
|
2016-03-16 14:18:57 +08:00 |
 cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-11 17:25:30 +08:00 |
|
huang
|
8079254089
|
首页增加访问统计
|
2016-03-11 15:51:45 +08:00 |
 luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +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
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
2016-03-10 11:40:56 +08:00 |
|
cxt
|
5b4ff5ec8a
|
学生列表中的作业积分为负分
|
2016-03-10 09:22:49 +08:00 |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
2016-03-09 15:28:28 +08:00 |
|
huang
|
d3fd445108
|
数据迁移
|
2016-03-09 15:27:50 +08:00 |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
2016-03-09 11:15:43 +08:00 |
|
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
2016-03-08 17:38:38 +08:00 |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-08 11:29:58 +08:00 |
 Tim
|
1deb611ba2
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-07 10:58:57 +08:00 |
|
Tim
|
ef05867e6e
|
自动生成文件
|
2016-03-07 10:58:41 +08:00 |
|
cxt
|
0090c89dd1
|
数据迁移
|
2016-03-07 10:53:58 +08:00 |
|
huang
|
4f2937e1a2
|
英雄榜
|
2016-03-05 10:38:21 +08:00 |
|
huang
|
0a18f365ab
|
新的迁移
|
2016-03-05 08:00:56 +08:00 |
|
huang
|
094af07a2f
|
数据迁移
|
2016-03-05 04:22:01 +08:00 |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
2016-03-05 04:01:10 +08:00 |
|
huang
|
6ceb4f4549
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/course_contributor_score.rb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_homework_search_input.html.erb
app/views/users/_show_user_homeworks.html.erb
app/views/users/_user_homework_detail.html.erb
app/views/users/_user_homework_form.html.erb
app/views/users/user_homework_type.js.erb
app/views/users/user_homeworks.html.erb
app/views/users/user_homeworks.js.erb
|
2016-03-05 03:17:47 +08:00 |
|
huang
|
bafa151c0d
|
0
|
2016-03-05 03:16:04 +08:00 |
|
huang
|
3f56fa3405
|
0
|
2016-03-05 03:14:57 +08:00 |
|
huang
|
f381784a3c
|
数据迁移
|
2016-03-05 03:13:58 +08:00 |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
2016-03-04 15:31:40 +08:00 |
|
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
2016-03-04 11:37:14 +08:00 |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
2016-03-03 18:51:28 +08:00 |
|
Tim
|
f51d16c538
|
资源库样式调整
|
2016-03-02 18:20:36 +08:00 |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
2016-02-26 17:00:29 +08:00 |
|
Tim
|
e8234092ec
|
复制学期弹框调整
|
2016-02-26 11:16:12 +08:00 |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
2016-02-25 16:18:24 +08:00 |
|
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-24 16:08:38 +08:00 |
|
cxt
|
72c3fa1166
|
某个学生分数异常
|
2016-02-24 16:05:16 +08:00 |
 ouyangxuhua
|
11231d0ff9
|
1.解决组织配置报500的错误；2.增加转发表
|
2016-02-24 16:01:32 +08:00 |
|
ouyangxuhua
|
3eb7c62b85
|
组织子域名迁移
|
2016-02-23 17:09:33 +08:00 |
|
ouyangxuhua
|
16efcafe77
|
注释迁移
|
2016-02-23 16:55:25 +08:00 |
|
ouyangxuhua
|
035b22d6dd
|
Merge branch 'ouyangxuhua' into develop
|
2016-02-23 16:49:12 +08:00 |
|
ouyangxuhua
|
2a26fd4e75
|
修改组织子域名的问题
|
2016-02-23 16:48:31 +08:00 |
|
ouyangxuhua
|
d818e1774b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-02-23 16:18:01 +08:00 |
|
huang
|
69ae7e3845
|
解决附件无法更新问题
|
2016-02-23 15:45:19 +08:00 |
|
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
2016-02-23 13:36:05 +08:00 |
|
ouyangxuhua
|
c91ef44570
|
组织子域名：所有子域名保存到secdomains表，将组织表中的子域名迁移到secdomains表中，并修改相应的代码
|
2016-02-23 12:52:04 +08:00 |
|
cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
2016-02-22 18:10:20 +08:00 |
|
cxt
|
3369183fb7
|
课程表的数据迁移
|
2016-02-20 18:16:07 +08:00 |
|
Tim
|
89eff0f920
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-02-20 16:29:28 +08:00 |
|
Tim
|
e223ac77d0
|
自动生成文件
|
2016-02-20 16:28:19 +08:00 |
|
cxt
|
096320d04c
|
发布问卷时默认选中“允许学生查看调查结果”
|
2016-02-20 10:50:46 +08:00 |
|
huang
|
aa22a253ba
|
“发送至”弹框飘动问题
|
2016-02-20 09:45:37 +08:00 |
|
cxt
|
cc7d75a046
|
Merge branch 'szzh' into develop
|
2016-02-03 09:28:24 +08:00 |
 guange
|
7f8f3fa152
|
被rubymine坑了，这两个文件没加进去
|
2016-02-02 18:47:53 +08:00 |