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

resolved rebase merge conflicts

Corrected spelling of text_desription field in token_permission_types

fixed db migration so that it does not update user records in TEST mode. Added sqlite3 to gemfile for tests. Added languages fixture

updated seeds file with the correct orcid id scheme settings

resolving merge conflicts during rebase

ran db migrations

setup dynamic omniauth provider structures and tied it into devise

modifying relationship between users and organisations \n -users now belong_to organisation \n -organisations now have_many users \n -removed the depricated user_org_roles structure with migration \n -moved data out of that structure into the existing organisation_id field of users to complete relationship \n -re-evaluated functions to do with organisation_id field, as it was used as a placeholder before

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

changed schema to be correct for point of migration of data

Fixed typos: changed all change_org_detials to change_org_details

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

removed boolean limit as postgres has proper boolean support

Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes

merged DCC changes into master

ensured users loose roles upon org changing and added depricated tags to roles

added granting api to orgs permission

Branding changes (#24) ...

- Removed the description field from organisation
- Added a contact email field to organization
- Added an email address validator
- Updated organisation logo upload so that the system will resize the image to the correct height rather than forcing the user to provide a 100x100 image
- Change how the organisation logo is displayed 

* updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.

* removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly

* changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications

* Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.

updated seeds file

added pundit auth to organisations controller

added magic string and constant structure for auth

Merging current stable development branch into master (#23) ...

This is our unofficial v.0.1.0 release. It includes:
- Rails 4.2 migration
- Internationalization
- API
- Institutional logo upload (thanks to Weiwei and the Univ. of Alberta)
- Generic branding
- General cleanup of code and bug fixes

fixed merge conflicts in Gemfile and Schema.rb

Reorganized gemfile and commented out unused gems

fixed merge conflict with schema.rb

fixed merge conflict in schema.rb

Updated Gemfile to use Rails 4.2.7, fixed some minor issues with locale initializer (#21) ...

* 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.

* Updated static page links so that they use localized paths. Added new locized_routes flag to the contact-us initializer and upgraded its gem

* Updated gemfile to specify specific version of contact-us

* Added some bug fixes that were a part of an old 'upgrade-bootstrap' branch but were missed when creating the rails-4-2 pull request. Also replaces the static page urls with localized versions

* removed console.log debug statements

* Organized locale files for dependencies into subdirectories

* Added localization files for the contact-us gem

* Updated load path on locales initializer so that it understands subdirectories. separated en contact-us locale into en-Uk and en-US. updated contact_us page to use gem's built in localization files

* Switched the dmptool to use en-US localization

* updated en-UK and en-US locale files to make sure that they use their respective locale ids instead of en. Added a branding yaml file for org and app names

* Change name of the application's root module from DMPonline4 to DMPRoadmap

* Began removing branding variables from the locales file and placed them in branding.yml

* finished initial branding of static pages

* Created DMPRoadmap logo and swapped out JISC logo for UC3 logo.

* commented out version specification in Gemfile for the contact-us gem

* Capified the application

* configuring capistrano

* Updated the contact_us gem version for localized paths

* capistrano config

* updated contact_us gem version

* changed server connection methodology

* removed Gemfile.lock, contact_us initializer, and /config/environments files from gitignore

* added initializers that were previsouly ignored by gitignore

* Changed DMPonline references to DMPRoadmap

* removed web_console reference in config/environments/development.rb because it is causing issues with capistrano deploy and does not seem to be needed

* removed web_console from gemfile because its causing deployment issues

* trying to remove web_console

* Revert "trying to remove web_console"

This reverts commit 7a1b714.

* Revert "removed web_console from gemfile because its causing deployment issues"

This reverts commit f8f8316.

* removed Gemfile.lock from .gitignore

* Updated config.ru to newer rails style

* tweaked deploy script

* added phusion passenger start/stop to deploy.rb

* Added passenger to gemfile

* Added passenger to gemfile

* tweaks to cap deploy.rb

* Changed staging.rb to stage.rb for capistrrano

* commented out line in config.ru

* commented out line in config.ru

* Removed capistrano deployment files

* Removed capfile

* reran bundle install to build Gemfile.lock

* Updated version of ruby to 2.2.2 in travis

* rebuilt db schema

* added length specification to a few indexes that are causing travis mysql db setup issues

* Switched travis to use mysql 5.6

* Switched travis to use mysql 5.6 and added params to create table to allow for >767 bytes indexes

* removed mysql 5.6 specifications form travis file. added limits to size of friendly_id_slugs index

* removed mysql 5.6 specifications form travis file. added limits to size of friendly_id_slugs index

* fixed merge conflict in .travis file

* Updated gemfile to specify >= ruby 2.2.2. Updated Rails to the latest version due to an XSS vulnerability. updated locale initializer to handle migration issue where it was checking default_location in langauges table before the column exists. Also added check for instances where no default langauge is specified. Rebuilt schema.rb. Fixed issue with seeds.rb reported by Weiwei

* Added languages to the seeds.rb file

* Fixed syntax error in environments/test.rb created during merge conflict resolution