Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap ... Conflicts: Gemfile app/models/ad_banner.rb		2012-05-15 23:02:22 +08:00
..
backtrace_silencers.rb	…
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
impression.rb	Add impressionist	2012-05-15 21:26:09 +08:00
inflections.rb	…
load_config.rb	close alpha on nccu	2012-03-20 14:38:01 +08:00
load_lists.rb	rails 3.1 and designs (with bug)	2011-07-12 16:00:57 +08:00
middle_site_connection.rb	Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly.	2012-05-15 11:28:24 +08:00
mime_types.rb	…
nccu_ldap_connection.rb	Remove unless config file	2012-05-15 11:37:45 +08:00
override_and_new_class_methods.rb	…
resque.rb	God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.	2012-05-08 20:26:36 +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