Merge branch 'development' into development

Change notes to work with AJAX calls.

added logic to db/seeds.rb to always create a default org for the one defined in config/branding.yml. This is the managing org

reverted changes to application_controller and schema.rb

Merge branch 'development' of https://github.com/CDLUC3/roadmap into development

Quick fix for i18n issue which prevents db:setup because of lack of Languages table

started switching I18n references in test files to Fastgettext

resolve conflicts from merging Roadmap into DCC

removed some old empty test files. removed facebook example from identifier_schemes seed

Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now DMPRoadmap/roadmap#159

Added a rake task to port orcids from the old field in the users table over to the new user_identifiers table. Removed the old unworking migration (because orcid is not in the table so it never runs). Added a new db migration to remove the old users.orcid_id column. The rake task would need to be run prior to the db migration though so commenting it out for now

leaving the two migrations caused schema issues this cleans it up

change question_format to use enum rather than bits

merge optimistic locking into dev

Optimistic Locking ...

- add bit field to question_format so we don't have to test strings to determine format

- add isOptionBased to question so we dn't have to do multiple string comps for this - there was a boolean already in the DB not being used

- add migration to add bit field

- add migration to add lock_version field to answer

- change answers_controller to do optimistic locking

- change answers controller not to redirect to plans/phase/edit as it wasn't doing anything

- introduced answers/update.js.erb to handle the return from /answers/update.

- to do the conflict resolution you need the old answer and new answer objects. Tried using clone but it doesn't work because it only does a shallow copy. So adopted a "nuclear-option" deep copy but it's a bit much. A compromise would be better.

config/initializers/locale.rb getters/setters pointing at FastGettext. en-UK renamed to en_GB. DMPRoadmap/roadmap#98

URLs without locale param

updated languages en-US en-UK to en_US en_UK

Merge pull request #30 from DigitalCurationCentre/final_schema ...

updated migrations to comply with validations, added guidance-guidanc…

updated migrations to comply with validations, added guidance-guidance_groups many to many relationship back in for migration

added check to migration to see if new_plan table exists prior to attempt to create a new NewPlan model

first step in reducing page edit sql queries

fixed merge conflicts in schema.rb

ran db:migrate on test

init commit of deep_copy for templates [untested]

fixed a few merge conflicts

added theme unit tests and started cleanup of remaining existing tests

merge in changes from origin

port of plan creation and editing to new data model

removed region_group (and underlying table) and replaced with has_and_belongs_to_many relationship on Region so that we can do region.super_region and region.sub_regions. Added unit tests for Region