W. Andrew Loe III 0937d2ba9d Merge branch 'master' of http://github.com/mixr/facebooker2 ... * 'master' of http://github.com/mixr/facebooker2: - the async call needs to load into the body, otherwise FB.ui doesn't work in "dialog" mode - facebook also recommends loading into the front of the body: http://developers.facebook.com/docs/reference/javascript/FB.init added methods fb_concat and fb_html_safe -> use concat or not, depending on rails version -> use html_safe when available fixed version check make fb_connect_async_js return a html_safe string for rails 3 use :locale parameter in options to set locale of fb-connect javascript assets Conflicts: lib/facebooker2/rails/helpers/javascript.rb		2010-08-24 01:00:51 -07:00
..
rails	Merge branch 'master' of http://github.com/mixr/facebooker2	2010-08-24 01:00:51 -07:00
rails.rb	Added basic controller and helper code	2010-05-05 11:42:11 -04:00