Fixes for #311, #345.

removed old shib handler from edit profile page

updated forms on create/edit plans, contact_us, profile pages to match consolidated css

converted all <form><table> and <form><ol> to <fieldset> on non-org-admin pages DMPRoadmap/roadmap#125

fixed merge conflicts

updated new css and swapped out use of table with fieldset on plan details edit DMPRoadmap/roadmap#125

fixed layout of edit profile page DMPRoadmap/roadmap#230 DMPRoadmap/roadmap#125 DMPRoadmap/roadmap#293

Get rid of custom Shib code & revert to generic Omniauth for everything. Modify identifier_schemes table to add scheme specific urls.

hide language dropdown on profile page if there is only one language available DMPRoadmap/roadmap#237

I18n replaced from controllers. DMPRoadmap/roadmap#98

URLs without locale param

resolved merge conflicts

pulled data access out of devise/registrations/edit

code style/revisions for devise registrations edit view

updates so that a user can log into the site \n updated application_controller, user model, registrations edit view, and layouts branding

replaces Organisation. with Org. in all files

resolving merge conflicts during rebase

Added a new identifier_schemes table and corresponding user_identifiers join table. Added the initial ORCID identifier scheme to the seeds.db file. Updated the locales file to include corresponding identifier tooltip language, logos, and initial connection message. Updated user profile page to dynamically display identifiers

Merge branch 'master' of https://github.com/DMPRoadmap/roadmap into postgresql

removed all instances of comparing booleans to 1 or 0 for postgres compatability

Moved language load from registrations/edit page into the controller. Updated registrations/edit page code to directly create the <select> box rather than using rails helpers which for some reason would not actually select the current language value

fixed a bug where users' api_tokens would display if they had none

merging

conflicts

migrations and routes tests

dropdown and org language setting

migrations and routes tests

fixed the magic strings function

initial passover of removing magic strings

Rails 4.2 (#10) ...

* Migrated codebase from rails 4.0 to 4.2, also removed most of the version specifications from the gem dependencies and ran bundle update

* Commented out api test since it is incomplete and references a missing fixture. Also commented out stubbed performance test because that functionality is no longer a part of rails

* renamed config/environment to config/environments which is what rails is looking for. Commented out the DOCX mime type reference because it is already added by rails. Commented out the belongs_to_and has_many line in models/user because it is already defined by rolify gem

* updated ruby version to 2.1.10 for devise gem

* Added line to have tests auto-run db:migrate

* Ran db:migrate to update the schema since there were some pending migrations preventing travis from running rake

* removed schem_migration line from test_helper as it did not seem to help with the schema migration issue in travis

* Added fb:migrate and db:test:prepare commands to travis file

* replaced deprecated ActiveRecord::Migrator call in old db migration file

* Removed rake db tasks from travis file now that the offending migration script has been fixed

* added rake db:test:prepare back to travis file and added call to run default test task

* Updated find_by_all to the newer and more accepted 'where'

* Updated routes.rb to remove unecessary create and edit route definitions

* Fixed stack too deep error by commenting out circular reference to sections in the version model. Changed deprecated '.find(:all, :order => 'field ASC')' format to '.all.order('field')'

* removed redundant bootstrap file. using bootstrap.min.js going forward. updated css to default align all text to left

* Added js preventDefault to modal popup functions to prevent them from appearing and immediately disappering

* Replaced deprecated link_to_function. the call in the helpers/application.rb should eventually be rethought. We shouldn't be using the onclick function of an html element directly, we should use the jquery approach: .click()

* removed deprecated link_to_object function from helpers/application.rb and added client side js script to add new options to a question.

* Upgraded select2 js file

* Removed all accepts_nested_attributes_for for belongs_to associations because they were creating circular calls in ActiveRecord.

* Fixed add/remove option js

* Fixed i18n calls in erb files that were missing an equal sign (e.g. <% t('value'') %> --> <%= t('value') %> so that the value will appear to the user. Also updated i18n calls from admin.js with 'js.' prefix)

* Removed deprecated uniq_by call on ActiveRecord collection

* Updated textbox and textarea sizes on contact_us form. added a route for the 'future plans' page

* Added 'self' prefix to dmptemplate references in models/project.rb because of a scoping issue. tweaks to select2 dropdowns on create project page

* Moved i18n calls out of string content in toolbar.js

* Removed outdated i%() array initializers because they now create arrays of symbols instead of strings

* Fixes to the plan settings page

* Fixed issues with settings hash

* Removed some debug statements

* Added the new rails 4.2 byebug gem

* added rails 4 bin

* added rails 4 bin

* tweaks to env and session_store cookie domain

* Updated routes to make lock/unlock paths use json by default

* updated routes for lock/unlock section on plan form

* fixed issue with lock/unlock using .json extension in ajax call. fixed unknown i18n references in plans.js

* Fixed issue with location of web-console in the Gemfile.