Chnage progress bar to reduce num queries. Fixes DMPRoadmap/roadmap#103

trying to reduce data access queries. Needs more work

merge in changes from origin

first port of plan creation and editing to new data model

resolved merge conflicts

merged final_schema changes into visibility

fixed merge conflicts

extracted plan visibility work out of dev branch for PR to DCC

updated admin_phase view and partials associated with it to use new data access

removed substance-forms modifications from the dev branch. will place in a separate branch so that we can continue development

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 answer text area to substance editor.

Added substance-rails gem and then included the appropriate js and css libraries into the asset pipeline

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

added JS logic to prevent is_test and is_public from both being true on the project edit page. Also added include to projects show page so that it pulls in the projects.js file

Merge pull request #16 from DMPRoadmap/development ...

Development

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.

added a initialization helper to assist with omniauth provider registration. Added a remove.png image for disconnecting providers from user accounts

bugs found in fr dmponline

Merge branch 'master' into add-orcid-functionality

editing a guidance by question now shows template through question

fixed bug where selecting guidance was impropperly filtering

Merge branch 'master' into postgresql

moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views

Corrected spelling of text_desription field in token_permission_types

merge postgresql -> master

added rake task to seed database with key values, additionally added rake task to perform all migration tasks

resolving merge conflicts

moved migrating user permissions to a rake task migrate:permissions

reverted changes to devise that were attempting to redirect users to the login page after session expiration. It was causing occassional sign_in issues due to a redirect loop