 huang
|
e77a891bc6
|
消息查询语句优化，添加索引
|
2016-03-21 16:36:25 +08:00 |
|
huang
|
2793a9a874
|
0
|
2016-03-18 15:39:39 +08:00 |
|
huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:18:31 +08:00 |
|
huang
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
2016-03-18 15:17:49 +08:00 |
 cxt
|
dc4a7ee2e6
|
Merge branch 'cxt_course' into develop
|
2016-03-18 14:53:43 +08:00 |
|
cxt
|
24318e3d6b
|
题库的刷新
|
2016-03-18 12:47:25 +08:00 |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
2016-03-17 16:06:05 +08:00 |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
2016-03-17 15:27:52 +08:00 |
|
huang
|
84470af2ff
|
删除的课程和项目不在发送中显示
|
2016-03-17 14:47:14 +08:00 |
|
huang
|
0a881f14e8
|
导入添加自动搜索
|
2016-03-16 17:06:11 +08:00 |
|
huang
|
064dc81ed6
|
解决公共资源删除资源后统计数字不减少的问题
（增加删除回调）
|
2016-03-16 13:48:02 +08:00 |
|
huang
|
9aab10c05a
|
代码更新
|
2016-03-15 17:29:37 +08:00 |
|
huang
|
a10475fa65
|
公共资源删除、新建代码优化
|
2016-03-15 16:28:35 +08:00 |
|
huang
|
22ce591c36
|
资源库添加搜索过滤
|
2016-03-15 15:42:20 +08:00 |
|
huang
|
5681d329d6
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/news_controller.rb
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-15 11:12:24 +08:00 |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
2016-03-15 11:09:11 +08:00 |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
2016-03-15 09:47:58 +08:00 |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
2016-03-15 09:26:26 +08:00 |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
2016-03-14 16:35:18 +08:00 |
|
cxt
|
1aa5450e4a
|
题库支持按发布者、来源、类型的排序
|
2016-03-14 14:39:58 +08:00 |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 19:31:22 +08:00 |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
2016-03-11 19:31:06 +08:00 |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
2016-03-11 18:06:43 +08:00 |
|
huang
|
8079254089
|
首页增加访问统计
|
2016-03-11 15:51:45 +08:00 |
|
huang
|
440cd04414
|
Merge branch 'develop' into hjq_new_course
|
2016-03-10 17:14:19 +08:00 |
|
cxt
|
fa3fd56686
|
题库发送课程的弹框搜索不能用
|
2016-03-10 15:48:39 +08:00 |
|
huang
|
c947121e2b
|
消息不显示问题（未完）
|
2016-03-10 14:52:49 +08:00 |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
2016-03-09 11:15:43 +08:00 |
|
cxt
|
3424be695e
|
题库：发送的弹框中，不要出现已经删除的课程
|
2016-03-08 09:12:37 +08:00 |
 ouyangxuhua
|
2ea553e988
|
Merge branch 'ouyangxuhua' into develop
|
2016-03-07 16:15:13 +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
|
cff5e9171f
|
导入作业后页面不应跳转到被导入的作业页面
|
2016-03-07 11:21:58 +08:00 |
|
huang
|
814e766577
|
课程过滤
|
2016-03-04 21:22:47 +08:00 |
|
cxt
|
782bbc775b
|
公共资源库的统计
|
2016-03-04 21:04:21 +08:00 |
|
huang
|
de1c2e18c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-04 18:37:46 +08:00 |
|
huang
|
ae40a4ea61
|
公共资源相关功能
|
2016-03-04 18:22:22 +08:00 |
|
huang
|
bbbf13084e
|
修改搜索功能，页面跳转
|
2016-03-04 16:05:58 +08:00 |
|
huang
|
dfddb30ca3
|
附件引用
|
2016-03-04 14:21:39 +08:00 |
|
cxt
|
6ca702eb2c
|
题库发送的课程列表中不包含当前作业所在的课程
|
2016-03-04 13:18:43 +08:00 |
|
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
2016-03-04 11:37:14 +08:00 |
|
huang
|
50011985a9
|
课程资源库添加资源描述
|
2016-03-04 11:19:07 +08:00 |
|
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
2016-03-04 11:11:25 +08:00 |
|
cxt
|
e2ff348075
|
题库的作业过滤
|
2016-03-04 11:07:53 +08:00 |
|
cxt
|
0cd536fcc9
|
题库增加发布者姓名搜索
|
2016-03-04 10:34:04 +08:00 |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-03-04 09:33:38 +08:00 |
|
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
2016-03-04 09:32:49 +08:00 |
|
huang
|
5ab9e3b5b7
|
资源搜索
作业留言
|
2016-03-04 09:29:20 +08:00 |
|
huang
|
e9c9112b38
|
公共资源封装
|
2016-03-04 00:41:41 +08:00 |
|
huang
|
8815e99db5
|
资源上传跳转问题
|
2016-03-03 17:25:52 +08:00 |