 huang
|
aef2dd8d1a
|
版本库通过修订好，导出对应的文件，导出对应内容
高亮显示内容
内容修订对比 功能
|
2016-02-25 11:06:10 +08:00 |
|
huang
|
40fb140b6d
|
版本库提交记录diff信息
|
2016-02-23 15:09:15 +08:00 |
 cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
2016-02-22 18:10:20 +08:00 |
|
cxt
|
ba66425bef
|
学生打开分组作业列表报500
|
2016-02-20 18:26:52 +08:00 |
 ouyangxuhua
|
1216f49ac2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.html.erb
|
2016-02-20 16:59:58 +08:00 |
|
huang
|
3fda270a66
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-02-20 16:58:20 +08:00 |
|
ouyangxuhua
|
a4ca676ccb
|
Merge branch 'szzh' into ouyangxuhua
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-02-20 16:49:19 +08:00 |
|
huang
|
212b37ef84
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-20 16:19:53 +08:00 |
|
huang
|
a7470e059d
|
历史版本提供附件下载功能
|
2016-02-20 16:19:35 +08:00 |
|
ouyangxuhua
|
fa08935f68
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/projects/settings/_new_repositories.html.erb
|
2016-02-20 11:13:38 +08:00 |
|
huang
|
534d93de77
|
弹框位置调整
|
2016-02-20 10:59:49 +08:00 |
|
cxt
|
096320d04c
|
发布问卷时默认选中“允许学生查看调查结果”
|
2016-02-20 10:50:46 +08:00 |
 guange
|
b2551f904b
|
组织没有显示的问题
|
2016-02-04 12:51:23 +08:00 |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-02-02 15:51:49 +08:00 |
|
cxt
|
8b9bcb4719
|
导入题库的搜索不起作用
|
2016-02-01 10:04:07 +08:00 |
|
guange
|
71778ba948
|
拷贝课程图标
|
2016-01-29 22:10:04 +08:00 |
|
guange
|
724ff31751
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2016-01-29 21:16:27 +08:00 |
|
guange
|
eb9232a087
|
at controller 的json应该登录
|
2016-01-29 21:15:23 +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
|
1b5cdbe628
|
推荐的私有课程，点击“资源”返回403，点击“作业”也应该返回403
|
2016-01-29 19:41:47 +08:00 |
|
ouyangxuhua
|
b7f1177938
|
1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新
|
2016-01-29 18:11:16 +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 |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
2016-01-29 15:37:03 +08:00 |
|
cxt
|
e9a7f6f826
|
导出学生作业成绩列表
|
2016-01-29 11:02:57 +08:00 |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
2016-01-28 16:27:46 +08:00 |
|
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
2016-01-28 09:51:05 +08:00 |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
2016-01-27 17:26:57 +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
|
19003f27fc
|
课程添加is_copy属性
|
2016-01-26 15:05:45 +08:00 |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
2016-01-26 11:17:55 +08:00 |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
2016-01-26 11:05:25 +08:00 |
|
ouyangxuhua
|
dda64245b3
|
解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。
|
2016-01-26 10:35:54 +08:00 |
|
cxt
|
945d0a933f
|
项目资源统计为负数
|
2016-01-25 17:34:04 +08:00 |
|
cxt
|
184e0ee689
|
管理员界面增加项目、组织、课程、用户、作业个数的显示
|
2016-01-25 16:50:34 +08:00 |
|
cxt
|
b6e13340e5
|
个人留言的删除功能
|
2016-01-25 15:33:50 +08:00 |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
2016-01-25 14:19:39 +08:00 |
|
cxt
|
4465e93dae
|
最近登录报500
|
2016-01-25 10:16:33 +08:00 |
|
cxt
|
4530e7896a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 20:55:31 +08:00 |
|
cxt
|
8a2a1d2bc9
|
Merge branch 'szzh' into develop
|
2016-01-22 20:55:18 +08:00 |
|
cxt
|
fc0b589760
|
Merge branch 'cxt_course' into szzh
|
2016-01-22 20:54:14 +08:00 |
|
cxt
|
3de8687440
|
留言页面的动态内容不生成链接，留言回复的样式更改
|
2016-01-22 20:11:49 +08:00 |
|
huang
|
19bb545993
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 18:49:28 +08:00 |
|
huang
|
16cb4add09
|
issue局部刷新属性问题
|
2016-01-22 18:48:40 +08:00 |
|
ouyangxuhua
|
26f8500671
|
博客回复后，该博客的更新时间为当前时间
|
2016-01-22 18:42:50 +08:00 |
|
ouyangxuhua
|
2d07801f52
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 18:10:50 +08:00 |
|
ouyangxuhua
|
dbed8379d3
|
新建组织允许游客下载选项功能修复
|
2016-01-22 18:10:32 +08:00 |
|
huang
|
58b5dbdf9a
|
版本库最近一次提交时间存入数据库
精品课程数据迁移
|
2016-01-22 18:00:01 +08:00 |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 17:30:07 +08:00 |