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
..
_app_link.html.erb	作业回复	2014-05-16 11:04:08 +08:00
_form.html.erb	bootstrap & tag bug	2014-05-23 17:07:58 +08:00
_links.html.erb	system bin, 坑	2014-06-13 15:42:59 +08:00
_temp.html.erb	0604	2014-06-04 14:13:26 +08:00
_type_edit.html.erb	1、资源发布者的分类和tag编辑；	2014-05-14 15:08:06 +08:00
add_exist_file_to_project.js.erb	毛的资源库关联文件	2014-03-06 16:47:28 +08:00
autocomplete.js.erb	毛的资源库关联文件	2014-03-06 16:47:28 +08:00
delete.js.erb	增加了附件删除功能	2013-09-18 22:56:01 +08:00
destroy.js.erb	footer , footer of base_course,upload files count and delete all upload	2014-04-17 08:33:44 +08:00
diff.html.erb	first commit	2013-08-01 10:33:49 +08:00
file.html.erb	first commit	2013-08-01 10:33:49 +08:00
renderTag.js.erb	调整资源文件界面	2014-05-17 14:07:57 +08:00
show.api.rsb	first commit	2013-08-01 10:33:49 +08:00
upload.api.rsb	first commit	2013-08-01 10:33:49 +08:00
upload.js.erb	文件上传去掉tag显示	2014-06-17 09:22:10 +08:00