Commit Graph

33 Commits

Author SHA1 Message Date
nwb e8705bccb1 修改文件上传界面样式 2014-07-02 14:58:52 +08:00
nwb 2b855badf9 修正课程资源库关联已有资源功能 2014-07-02 09:11:45 +08:00
nwb 7425178419 Merge branch 'CourseModify' into szzh
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_homework.html.erb
	app/views/projects/_course.html.erb
	db/schema.rb
	lib/redmine/activity/fetcher.rb
2014-06-26 08:53:16 +08:00
z9hang c0d97870d5 项目=》文档 文档提交者添加超链接 2014-06-18 17:35:05 +08:00
nwb 462e5ab589 修改课程资源文件类型编辑BUG 2014-06-18 15:48:06 +08:00
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
Conflicts:
	app/controllers/application_controller.rb
	app/views/attachments/upload.js.erb
	app/views/courses/_homework_form.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/users/_my_joinedcourse.html.erb
	db/schema.rb
	lib/redmine.rb
	lib/redmine/access_control.rb
2014-06-17 10:12:44 +08:00
nwb cdaa27b52b 文件上传去掉tag显示 2014-06-17 09:22:10 +08:00
nwb 99e5644c4e 去掉上传文件的标签编辑 2014-06-16 17:45:14 +08:00
yanxd 93d13c8867 system bin, 坑 2014-06-13 15:42:59 +08:00
nwb 4404222437 0604 2014-06-04 14:13:26 +08:00
nwb 61135a352a 上传文件表单支持添加文件标签 2014-05-28 14:43:20 +08:00
yanxd 5364687160 bootstrap & tag bug 2014-05-23 17:07:58 +08:00
nwb 4156983494 缺陷添加缩略图显示 2014-05-20 15:05:54 +08:00
nwb 4d21933e09 1.优化资源文件上传下载界面
2.教师的课程界面优化
2014-05-20 11:33:17 +08:00
nwb 5ca9d96acd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-17 14:39:00 +08:00
nwb 7df6be8ff4 调整资源文件界面 2014-05-17 14:07:57 +08:00
sw 4c6b514d03 Merge remote-tracking branch 'origin/szzh' into szzh 2014-05-17 11:15:40 +08:00
z9hang 5d15349482 编辑作业时显示已添加的附件 2014-05-16 17:45:20 +08:00
sw b27b3e0a5a Merge remote-tracking branch 'origin/szzh' into szzh 2014-05-16 11:04:49 +08:00
sw 029eb1a195 作业回复 2014-05-16 11:04:08 +08:00
nwb 1caa7940dc 1、资源发布者的分类和tag编辑;
2、网站管理者对资源的再分类和tag再编辑
2014-05-14 15:08:06 +08:00
nwb 8badbb1e78 1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
2014-05-14 15:03:04 +08:00
wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop
Conflicts:
	Gemfile
	app/controllers/tags_controller.rb
	app/views/layouts/_base_header.html.erb
	config/routes.rb
	db/schema.rb
2014-04-18 16:03:52 +08:00
kg d450da9df8 footer , footer of base_course,upload files count and delete all upload 2014-04-17 08:33:44 +08:00
wanglinchun b4b61a3422 修改小bug;设计打分和评论唯一性前提交版 2014-04-14 21:54:54 +08:00
wanglinchun f2ed529b92 df 2014-04-14 17:30:05 +08:00
yanxd 0b385cdbbb 毛的资源库关联文件 2014-03-06 16:47:28 +08:00
yanxd e9373991d2 maoxian 2014-03-05 11:17:16 +08:00
yanxd 7068359e9e attachment.nil? 2013-12-19 16:04:01 +08:00
yanxd 60be338848 作业提交的部分问题
禁止js的情况
修复一些路由错误
ie提交的问题.
2013-12-19 15:59:10 +08:00
baiyu c2302dc0c7 增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
2013-09-18 22:56:01 +08:00
zhangyang 06a859eb5e 修正上传文件显示 2013-08-06 16:08:54 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00