chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

2012-10-29 16:10:07 +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

custom_validators.rb

Add custom validator and fix .html_safe with rescue

2012-07-31 14:25:46 +08:00

dehumanize.rb

Add new created files to previous commit

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

devise.rb

Fix bug: User cannot connect using the orbit button (Devise configuration)

2012-10-26 17:42:14 +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

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

put ldap setting into config file. should load be rails env. Also make god config more friendly.

2012-06-22 14:32:28 +08:00

load_lists.rb

rails 3.1 and designs (with bug)

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

middle_site_connection.rb

fix nccu login

2012-09-25 15:07:07 +08:00

mime_types.rb

init rails 2.3.2

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

nccu_ldap_connection.rb

put ldap setting into config file. should load be rails env. Also make god config more friendly.

2012-06-22 14:32:28 +08:00

override_and_new_class_methods.rb

Try fb from override and generated page

2012-08-08 11:04:19 +08:00

resque_auth.rb

Add authorization for rescue interface

2012-08-12 23:29:13 +08:00

resque.rb

fix for rescue job failed on 171

2012-10-08 16:42:49 +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

social_share_button.rb

Fix bugs on 172:180

2012-08-08 17:56:00 +08:00

without_callbacks.rb

Skip callbacks

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