Commit Graph

39 Commits

Author SHA1 Message Date
cxt 98946b9855 课程上传资源弹框的延迟发布功能 2016-02-22 18:10:20 +08:00
ouyangxuhua de229c0f1c 组织资源栏目的文件可以被引用至当前组织下的资源栏目 2015-12-17 14:51:02 +08:00
ouyangxuhua 0602a03e12 组织资源类型的栏目,增加搜索功能 2015-12-14 10:26:34 +08:00
ouyangxuhua e98338bf22 栏目增加资源类型,可以添加文件、删除文件、显示文件等 2015-12-11 16:30:50 +08:00
huang 7d87915413 Merge branch 'szzh' into dev_hjq
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/homework_attach/_homework.html.erb
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
2015-04-17 15:07:01 +08:00
huang fc8dacbd5f 引入资源列表界面调整 2015-04-17 12:56:54 +08:00
sw b7e9442800 添加、删除TAG云时TAG云列表刷新 2015-04-16 14:01:58 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
2015-04-16 10:26:03 +08:00
sw 0cc809c3e0 实现课程资源TAG云功能 2015-04-15 19:57:16 +08:00
sw 2e3294a341 1、增加根据资源列表,获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
2015-04-15 17:16:28 +08:00
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
2015-04-07 13:47:39 +08:00
z9hang 5eac727584 项目资源模块功能完成(样式尚未调整,代码尚未应用) 2015-03-31 15:57:15 +08:00
z9hang c4e9321e14 将attachment_candown方法提取到application_help里面 2015-03-31 10:03:52 +08:00
z9hang 43af61d684 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-31 09:34:48 +08:00
sw a84af9d138 课程私有资源不显示在没有权限查看的用户上 2015-03-30 17:44:40 +08:00
z9hang eabcd4e92b 项目资源模块新界面(列表显示,排序等功能,样式尚未调) 2015-03-30 17:14:52 +08:00
lizanle 90bce76409 私有项目的资源数,只要不是本人传的,都看不到 2015-03-26 15:23:34 +08:00
z9hang a05061af73 #1859 课程--资源库:全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程 2015-03-12 11:17:36 +08:00
z9hang 9abe730dff 恢复私有课程的公开资源不能引用问题(导致搜索速度慢) 2014-12-12 18:06:10 +08:00
z9hang e4439daf3b 全站搜索bug 2014-12-12 16:59:18 +08:00
z9hang c0a0c41e14 私有课程的公开资源能下载bug 2014-12-12 16:53:49 +08:00
z9hang 2b3edbc8fb #1663 课程资源库--全站搜索:老师不能引用其他资源至我的课程了 2014-12-05 09:54:13 +08:00
z9hang 29d4266c6c 引用次数的统计修改及按引用排序 2014-12-02 15:30:32 +08:00
z9hang 298b767fc4 资源显示,对于课程外人员不在显示私有资源 2014-12-01 15:03:47 +08:00
z9hang 514dcb97a0 完成资源按时间、下载次数排序功能 2014-11-28 11:33:51 +08:00
z9hang 71e7d2c872 修改全站搜索结果显示策略:私有资源属于当前课程,且当前用户为当前课程的成员时可见,其他情况私有资源不可见 2014-11-27 17:17:33 +08:00
z9hang 9898e1650b 1、学生看不到私有资源bug。2、引用资源弹框中无课程可显示时不显示引入我的课程按钮。3、引用资源时提示信息样式修改 2014-11-27 10:18:41 +08:00
z9hang b0db7dfece 添加判断课程是否为当前学期或下一学期方法 2014-11-26 17:38:46 +08:00
z9hang 8a3669ba3b 引用次数统计包括多级引用 2014-11-26 15:26:57 +08:00
z9hang 5a20945e0d 选入我得课程列表中添加课程学期的显示 2014-11-26 14:54:31 +08:00
z9hang feccad8fa5 用户为创建课程,或没有作为教师的课程时,不显示引入我的课程按钮 2014-11-24 14:39:31 +08:00
z9hang 436cf1175f 修改课程资源模块相关问题 2014-11-22 13:45:17 +08:00
z9hang 36e7b222bb 课程资源修改为公开的也需登录才能下载 2014-11-22 10:06:56 +08:00
z9hang 2348e063d1 调整选入课程弹框中列表的显示策略 2014-11-21 15:54:29 +08:00
z9hang f2da5704ef 课程应用的功能实现 2014-11-20 17:44:30 +08:00
yanxd 829c77879a typo 2014-05-14 17:12:04 +08:00
nwb 25dba88a08 1.优化界面
2.资源下载界面添加按文件类型分类浏览
2014-05-13 16:34:53 +08:00
nwb e5bbd68c8c 1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
2014-05-12 18:46:39 +08:00
yanxd 4bef2eee24 course can be shared files by project's member 2013-10-22 09:02:48 +08:00