socialforge/app/views/messages
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
..
_course_new.html.erb 1、修改无跳转的href链接为javascript:void(0) 2015-04-15 14:53:07 +08:00
_course_show.html.erb 课程新编辑器导致图片超出页面 2015-04-10 15:43:37 +08:00
_form.html.erb 修正课程讨论区样式。修正项目讨论区被影响的样式 2015-03-26 15:55:07 +08:00
_form_course.html.erb 更新public.css 2015-04-15 14:29:35 +08:00
_form_project.html.erb 1、修改附件列表排列和样式 2015-04-07 17:45:00 +08:00
_project_show.html.erb 讨论区。描述、主题换行 2015-04-15 00:30:33 +08:00
edit.html.erb Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
new.html.erb 1、修改附件列表排列和样式 2015-04-07 17:45:00 +08:00
quote.js.erb 1、修复课程讨论区引用功能 2015-04-08 17:25:52 +08:00
show.html.erb #898 引用回帖不转义的问题 2014-08-12 10:24:27 +08:00