sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh ... Conflicts: app/views/projects/show.html.erb db/schema.rb		2015-03-06 08:59:29 +08:00
..
_app_link.html.erb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
_course_type_edit.html.erb	修改课程资源文件类型编辑BUG	2014-06-18 15:48:06 +08:00
_form.html.erb	项目动态重写，并去掉首页缓存	2015-03-04 15:32:00 +08:00
_form_course.html.erb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
_links.html.erb	修改作业匿评界面，左侧附件名显示混乱	2015-02-06 10:51:29 +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_course.js.erb	修正课程资源库关联已有资源功能	2014-07-02 09:11:45 +08:00
add_exist_file_to_courses.js.erb	1、学生看不到私有资源bug。2、引用资源弹框中无课程可显示时不显示引入我的课程按钮。3、引用资源时提示信息样式修改	2014-11-27 10:18:41 +08:00
add_exist_file_to_project.js.erb	毛的资源库关联文件	2014-03-06 16:47:28 +08:00
autocomplete.js.erb	修复火狐不兼容自动换行的问题	2014-08-28 17:30:08 +08:00
delete.js.erb	增加了附件删除功能	2013-09-18 22:56:01 +08:00
delete_softapplications.js.erb	1.修复竞赛作品每次修改之后，都会吧图片清空的BUG	2014-07-30 15:48:13 +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	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-09-15 10:58:14 +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
updateFileDense.js.erb	1.用户申请加入项目向管理员发送邮件	2014-07-11 09:07:09 +08:00
update_file_dense.js.erb	设置资源公开与私有功能	2014-11-19 11:03:23 +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