socialforge/config/initializers
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
..
00-core_plugins.rb first commit 2013-08-01 10:33:49 +08:00
10-patches.rb first commit 2013-08-01 10:33:49 +08:00
20-mime_types.rb 添加作品列表导出excel功能 2014-12-30 14:29:30 +08:00
30-redmine.rb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00
autoreload_grape.rb auto reload api folder in development mode. 2014-12-09 15:16:47 +08:00
backtrace_silencers.rb first commit 2013-08-01 10:33:49 +08:00
delayed_job_config.rb 个人动态权限部分性能优化 2015-04-10 16:27:26 +08:00
inflections.rb first commit 2013-08-01 10:33:49 +08:00
kaminari_config.rb issue2012,分页显示方式修改 2015-03-11 15:30:24 +08:00
logger.rb 添加注释 2015-01-23 09:46:55 +08:00
rails_kindeditor.rb kindeditor配置文件 2015-03-16 15:31:11 +08:00
secret_token.rb first commit 2013-08-01 10:33:49 +08:00
seems_rateable.rb 加入了对赞功能模块,同时预留了踩功能,但暂时不使用。 2013-08-08 17:01:56 +08:00
send_mail.rb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00
session_store.rb 1. 将session改为跨子域。 2. 将session的存储改到files/cache_store下,用于nfs 2015-04-13 20:44:46 +08:00
task.rb tt 2014-07-31 09:52:52 +08:00