socialforge/app/views/news
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_form.html.erb 1、添加通知会alert 2015-04-03 15:01:26 +08:00
_course_news.html.erb 课程通知、个人动态 大图片超出页面 2015-04-10 16:14:19 +08:00
_course_show.html.erb 课程讨论区评论图片问题 2015-04-10 17:18:52 +08:00
_form.html.erb 项目界面缺失翻译调整 2015-04-10 16:59:45 +08:00
_news.html.erb 1.修改页面描述错误 2014-08-20 15:51:35 +08:00
_project_form.html.erb 新版项目界面(部分未完成,先合并) 2015-04-07 12:48:47 +08:00
_project_news.html.erb 修改新闻中测出的bug, 2015-04-14 23:58:27 +08:00
_project_show.html.erb Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
edit.html.erb 修改contest中出现的逻辑错误 2014-10-23 11:30:34 +08:00
index.api.rsb first commit 2013-08-01 10:33:49 +08:00
index.html.erb 1.迁移课程新闻数据 2014-06-11 16:46:13 +08:00
new.html.erb 去掉代码审查 2015-04-13 23:39:56 +08:00
show.html.erb 修改课程通知show方法,并添加独立视图 2014-06-18 16:29:29 +08:00