qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
trustieforge/public/images/new_project
History
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
..
btn.png 16:22 2015-03-06 16:22:07 +08:00
close.png 新版项目界面（部分未完成，先合并） 2015-04-07 12:48:47 +08:00
img_project.png 16:22 2015-03-06 16:22:07 +08:00
inputBg.png 16:22 2015-03-06 16:22:07 +08:00
jiantou.jpg 16:22 2015-03-06 16:22:07 +08:00
jiantou1.jpg 16:22 2015-03-06 16:22:07 +08:00
logo.jpg 16:22 2015-03-06 16:22:07 +08:00
pic_01.jpg 新版项目界面（部分未完成，先合并） 2015-04-07 12:48:47 +08:00
pic_ad.png 新版项目界面（部分未完成，先合并） 2015-04-07 12:48:47 +08:00
pic_down.png 新版项目界面（部分未完成，先合并） 2015-04-07 12:48:47 +08:00
pic_project.jpg 新版项目界面（部分未完成，先合并） 2015-04-07 12:48:47 +08:00
pic_question.png 新版项目界面（部分未完成，先合并） 2015-04-07 12:48:47 +08:00
public_icon.png 更新public.css 2015-04-15 14:29:35 +08:00