socialforge/app/views/attachments
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
..
_app_link.html.erb 修改contest中出现的逻辑错误 2014-10-23 11:30:34 +08:00
_course_file_links.html.erb 讨论区附件样式修改 2015-03-27 16:23:09 +08:00
_course_type_edit.html.erb 修改课程资源文件类型编辑BUG 2014-06-18 15:48:06 +08:00
_form.html.erb Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
_form_course.html.erb 附件上传国际化调整 2015-04-10 17:58:59 +08:00
_form_project.html.erb 1、修改附件列表排列和样式 2015-04-07 17:45:00 +08:00
_links.html.erb 修改isuue显示界面 2015-04-10 17:49:16 +08:00
_new_form.html.erb #2100 IE8中,课程--老师发布作业/学生提交作业,上传附件提交不了 2015-04-08 13:52:52 +08:00
_project_file_links.html.erb 新版项目界面(部分未完成,先合并) 2015-04-07 12:48:47 +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
add_exist_file_to_projects.js.erb 项目资源模块功能完成(样式尚未调整,代码尚未应用) 2015-03-31 15:57:15 +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 附件上传国际化:修改页面一些bug:用户主页个人得分身份信息修改 2015-03-19 17:21:11 +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