Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap ...

Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb

2012-03-19 14:27:15 +08:00

..

backtrace_silencers.rb

upgrade to rails3, but grip is broken

2010-03-08 16:04:05 +08:00

carrierwave.rb

Update carrierwave

2012-01-24 11:57:27 +08:00

cookie_verification_secret.rb

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

dehumanize.rb

Add new created files to previous commit

2012-02-16 13:09:09 +08:00

devise.rb

Complete for 229 check.

2012-02-24 19:07:47 +08:00

fix_using_obj_id.rb

Merge with sub_roles

2011-12-23 18:34:21 +08:00

inflections.rb

Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

2011-04-13 18:19:51 +08:00

load_config.rb

Merge server and rails_3_1

2011-08-18 13:43:33 +08:00

load_lists.rb

rails 3.1 and designs (with bug)

2011-07-12 16:00:57 +08:00

middle_site_connection.rb

LDAP with sync rake task

2012-03-06 16:41:06 +08:00

mime_types.rb

init rails 2.3.2

2009-05-08 00:53:18 +08:00

override_and_new_class_methods.rb

add missing file

2011-04-13 18:22:51 +08:00

rulingcom_ldap.rb

LDAP connection and modified Devise

2012-02-22 14:43:24 +08:00

secret_token.rb

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

session_store.rb

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

without_callbacks.rb

Skip callbacks

2011-09-01 18:28:04 +08:00