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
..
_app_link.html.erb	修改小bug；设计打分和评论唯一性前提交版	2014-04-14 21:54:54 +08:00
_form.html.erb	footer , footer of base_course,upload files count and delete all upload	2014-04-17 08:33:44 +08:00
_links.html.erb	maoxian	2014-03-05 11:17:16 +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
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	footer , footer of base_course,upload files count and delete all upload	2014-04-17 08:33:44 +08:00