 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
|
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
|
3f56fa3405
|
0
|
2016-03-05 03:14:57 +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
|
72c3fa1166
|
某个学生分数异常
|
2016-02-24 16:05:16 +08:00 |
|
huang
|
69ae7e3845
|
解决附件无法更新问题
|
2016-02-23 15:45:19 +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
|
6e93a5af33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/user_import_homeworks.js.erb
db/schema.rb
|
2016-02-02 15:55:07 +08:00 |
|
Tim
|
f3bcb3ca47
|
导入题库弹框位置调整
|
2016-02-02 15:23:23 +08:00 |
 guange
|
28035dfc47
|
子域名处理
|
2016-02-02 12:40:00 +08:00 |
|
guange
|
bb0ff4a14c
|
elasticsearch在开发环境下的补丁,默认不开启
|
2016-01-29 20:31:25 +08:00 |
|
Tim
|
55fddbcabe
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-29 16:52:14 +08:00 |
|
Tim
|
674a8e0035
|
单词折行问题
|
2016-01-29 16:16:02 +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 |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
2016-01-28 16:27:46 +08:00 |
|
guange
|
d8ef2f0965
|
个人留言中的at启用
|
2016-01-26 18:24:15 +08:00 |
|
cxt
|
19003f27fc
|
课程添加is_copy属性
|
2016-01-26 15:05:45 +08:00 |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
2016-01-26 11:17:55 +08:00 |
|
cxt
|
945d0a933f
|
项目资源统计为负数
|
2016-01-25 17:34:04 +08:00 |
|
huang
|
dfb8a3afbf
|
数据迁移
|
2016-01-22 22:35:47 +08:00 |
|
cxt
|
bbdced9bc1
|
留言页面的样式修改
|
2016-01-22 21:41:17 +08:00 |
|
huang
|
58b5dbdf9a
|
版本库最近一次提交时间存入数据库
精品课程数据迁移
|
2016-01-22 18:00:01 +08:00 |
|
huang
|
2947ff8997
|
精品课程数据迁移
|
2016-01-22 16:46:23 +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 |
 ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
2016-01-21 15:32:18 +08:00 |
|
ouyangxuhua
|
bd99352ab1
|
组织增加是否允许游客下载的选项
|
2016-01-21 15:31:36 +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 |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
2016-01-20 16:24:14 +08:00 |
|
Tim
|
a3c30ee965
|
issue上传附件样式修改
|
2016-01-19 17:31:59 +08:00 |
|
huang
|
b93b86b9a0
|
创建课程发送board
|
2016-01-18 17:16:33 +08:00 |
|
cxt
|
7f7d0ac6f7
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
2016-01-18 17:12:56 +08:00 |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
2016-01-18 10:16:29 +08:00 |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
2016-01-18 10:13:31 +08:00 |
|
huang
|
ed26242f94
|
版本库提交次数迁移
|
2016-01-15 21:19:52 +08:00 |
|
huang
|
64f972770f
|
添加board和attachment数据迁移
|
2016-01-15 10:41:34 +08:00 |
|
huang
|
20d550e755
|
提交次数默认值为空的数据处理
|
2016-01-14 21:25:36 +08:00 |
|
huang
|
09d2796ca7
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
处理冲突
|
2016-01-14 17:35:25 +08:00 |
|
Tim
|
13e289dfb5
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
|
2016-01-14 16:07:06 +08:00 |