Resolved merge conflicts with fr.yml locale file and the user.rb model. Kept 'language_id' in the attr_accessible list and kept both the self.from_omniauth and reset_password_link methods.

fix double sign-up bug: #69

Had to remove code that was building devise omniauth connections dynamically. The timing of when the rails engine builds the routes and the models is not conducive to this approach

Added domain to the identifier_Scheme table. Added unit and functional tests for the identifier_scheme functionality

fixed merge conflicts

Merge branch 'master' into add-orcid-functionality

fixed bug where selecting guidance was impropperly filtering

Merge branch 'master' into postgresql

removed commented out code from new branding changes

renamed layout partials to remove reference to dmponline. Updated configurations so that the code default assets are stored in lib/assets and any instance specific versions would be stored within app/assets. Move static page content out of the large locales files and placed examples of them into config/locales/static_pages

removed ability to customize view branding folder name. It will just be called branded now

moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views

Added tests for the new omniauth functionality

Removed logo from identifier_schemes db table and added it to yaml locales. Added more entries for to the locales for oauth. Added red 'x' removal link for oauths on profile page. updated registrations controller so that users hitting the oauth handler that are not already signed in are brought to a registration page with a new user record that is connected to the oauth identifier

Merge branch 'master' into add-orcid-functionality

Bug fix to the column layout handler on the view plans page

added additional locale message for identifier schemes and a remove icon

Merge branch 'add-orcid-functionality' of https://github.com/CDLUC3/roadmap into add-orcid-functionality

resolved rebase merge conflicts

fixed issue with settings data saved to the DB using an old version of the gem. stripped html tags from question text for display in the export form.

allowed organisations to save their details without submitting a contact email

updated application controller so that a user is redirected to the main landing page when then try to access a secure page when not logged in. Added the corresponding locale messages that will be displayed when this happens

updated passwords controller to redirect user to the main landing page after initiating a password reset. Removed reference to invalid spinner css from main layout file

updated gitignore to include initializers that should be server specfic. removed reference to missing spinner.css

made omniauth callback handler build dynamically based on db entries

updated nil/empty check in orcid callback

tweaked user_identifier record creation

changed render to redirect for post oauth

fixed syntax error in orcid omniauth callback

updated omniauth callback handler for orcid