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 conflicts

fixed merge conflicts in branding.yml and schema.rb

updated api templates endpoints to use new data access

updated additional parts of the admin_phase view to use the new schema's data access. Additionally changed models for suggested_answer, user, guidance_group and question to better reflect the associations in the schema

switched visibility over to an enum. updated the project objects accordingly. Added some more unit tests. Updated locale files with visibility text

added unit test for exported_plan. added validations to exported_plan and has_many side of relationship to user and plan

updated user model to allow signin_signout to detect permissions(admin/orgadmin)

Added magic strings and identifier schemes to new ES locale file. Updated names of magic string categories so that they match the table names

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

removed version and updated users_roles to users_perms

updated theme and user models's associations

updated roles to perms as per renamed table

added new_plans relation to users through roles

added migration to add foreign keys. Also needed to remove the temporary models, and update existing models to reflect the new relationships

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.

add a reset_password_link method for convenience

removed user_statuses, user_types, and user_role_types tables and associations which referenced them

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

profile save crashing

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

added identifier_Schemes table check to user.rb model. Both ActiveAdmin and Devise attempt to initialize the object during a rake command which forces a 'table does not exist' error.

fixed merge conflicts

Updated routes to check for the existence of the new identifier_schemes table because rake db:migrate initializes the Rails app and devise tries to make use of the new table

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

added additional locale message for identifier schemes and a remove icon

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.

tidied up new tests and fixtures. Commented out old tests that were failing. Updated relationship between TokenPermissionType and Organisation so that token_permission_type.organisations works