switched I18n.locale to FastGettext

updated seeds to use managing institution abbreviation instead of hard-coded 'CC'. Added basic functional tests for templates controller with small adjustments to check for nils in view and controller

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

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

resolve conflicts from merging Roadmap into DCC

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

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

added theme unit tests and started cleanup of remaining existing tests

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

Moved orcid_id from users table to user_identifiers. Added option_based flag to question_formats. switched Object.const_defined to table_exists checks in db migrations because rails loads references to classes on demand so the objects are likely not defined when the migrations run. safer to check for the underlying table's existence

resolved merge conflicts

added new seed file that works with new schema. commented out plans and answers for now though because plan model is unfinished

added some more attr_accessible attributes for new fields. finished up seed.rb file.

started seeds.rb rebuild to work with new schema. Removed guidance_in_group association from guidance. added some attr_accessible attributes

resolved merge conflicts

fixed merge conflict in seeds.rb file. installed substance-rails gem and updated code to swap in the substance-forms text-area for tinymce on the answer section of the edit plans page

switched visibility to be a bit flag using FlagShihTzu instead of a lookup table. adjusted db migration. Removed all of the empty stub test files generated by the rails scaffolding mechanism.

commented out problematic index in db migration for active admin table

removed old is_test and is_public migrations for projects table and added migration for visibilities table

replaces Organisation. with Org. in all files

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.

removed domain and stylesheet_id from organisation. Both were unused on the front and back ends of the tool

add spanish translations

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

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