jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/app
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
..
api/mobile Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
assets Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:27:56 +08:00
controllers Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
helpers Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
models Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00
services current_user判空 2015-04-15 10:30:56 +08:00
sweepers
…
views Merge branch 'szzh' into dev_hjq 2015-04-16 10:26:03 +08:00