Configure production envionrments, gemfile and application.rb for heroku deployment.
Configure production envionrments, gemfile and application.rb for heroku deployment.
Update schema
Merge branch 'master' of https://github.com/tylermorgan86/FanVoice
Merge branch 'master' of https://github.com/tylermorgan86/FanVoice
Got the update.
Begin adding facebook oauth login.
Sign in with facebook works. Nothing to see because user is not admin. Need to rearrange views.
Merge branch 'master' of https://github.com/tylermorgan86/FanVoice
Successfully uploading one file to character profile.
Replaced paperclip with carrier wave. Need to refactor test so that image upload is passing.
Change upload location to S3 is working.
Added jCrop functionality. It does not render the appropriate image into the preview field right now. Somehow jquery started loading correctly, not sure how. It might be the simple form i am using (input rather than textfield). Taking a look at that next.
Updated specs to passing. Commented out the last part of creating characters about uploading image. I can't get it to recognize the file label. In addition, it now redirects to image cropping, so it will be a little different.
Resolve merge conflicts and add branch from upload and oauthfb.
pull
Merge branch 'staging'

merging changes for oauth facebook and image upload