Commit Graph

565 Commits

Author SHA1 Message Date
huang 623114dc41 解决删除项目的私有资源显示在我的资源中的问题 2016-04-06 19:02:07 +08:00
alan 200561da92 修改《私有资源公共资源中不显示》 2016-03-29 16:43:14 +08:00
alan 90fd52970b fix bugger on 资源区 2016-03-29 10:15:18 +08:00
alan 395fb8fae6 修改pagination,资源区bug 2016-03-28 22:37:01 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
2016-03-25 16:16:55 +08:00
alan 4f5e083707 优化个人主页,缓存设置 2016-03-25 16:06:14 +08:00
cxt 46a05d1000 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 15:37:15 +08:00
alan 7108e6d763 减少数据库查询字段 2016-03-25 09:22:05 +08:00
huang f1ffd3852f Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-24 09:37:06 +08:00
huang 185ad829cd 项目访问速度优化 2016-03-24 09:36:46 +08:00
ouyangxuhua 1579a86f9f 老师给学生的作品打分后,学生再次编辑,要给老师和助教发消息提示 2016-03-23 17:19:25 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
alan 9273e37a5b 优化SQL查询:1,members与users表关联查询; 2,blogs表单查询 2016-03-23 00:04:53 +08:00
cxt aa1cbcdf87 课程留言动态加入个人动态 2016-03-22 16:44:53 +08:00
huang 12efbcb9ae Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-22 15:07:25 +08:00
huang e77a891bc6 消息查询语句优化,添加索引 2016-03-21 16:36:25 +08:00
cxt 74e77bf347 题库的来源排序不可用
题库的分布时间排序
2016-03-18 16:23:24 +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